fix for flaky e2e tests

MystenLabs · Jan 10, 2025 · 70d8b6c · 70d8b6c
1 parent ce979bb
commit 70d8b6c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/packages/deepbook/test/e2e/setup.ts b/packages/deepbook/test/e2e/setup.ts
@@ -67,11 +67,10 @@ export async function setupSuiClient() {
 		logger: (msg) => console.warn('Retrying requesting from faucet: ' + msg),
 	});
 
-	const configPath = path.join(
-		'/test-data',
-		`${Math.random().toString(36).substring(2, 15)}-client.yaml`,
-	);
-	await execSuiTools(['client', '--yes', '--client.config', configPath]);
+	const configDir = path.join('/test-data', `${Math.random().toString(36).substring(2, 15)}`);
+	await execSuiTools(['mkdir', '-p', configDir]);
+	const configPath = path.join(configDir, 'client.yaml');
+	await execSuiTools(['sui', 'client', '--yes', '--client.config', configPath]);
 	return new TestToolbox(keypair, client, configPath);
 }
 
@@ -82,6 +81,7 @@ export async function publishPackage(packageName: string, toolbox?: TestToolbox)
 	}
 
 	const result = await execSuiTools([
+		'sui',
 		'move',
 		'--client.config',
 		toolbox.configPath,
@@ -194,7 +194,7 @@ export async function execSuiTools(
 	const SUI_TOOLS_CONTAINER_ID = inject('suiToolsContainerId');
 	const container = client.container.getById(SUI_TOOLS_CONTAINER_ID);
 
-	const result = await client.container.exec(container, ['sui', ...command], options);
+	const result = await client.container.exec(container, command, options);
 
 	if (result.stderr) {
 		console.log(result.stderr);

diff --git a/packages/kiosk/test/e2e/setup.ts b/packages/kiosk/test/e2e/setup.ts
@@ -62,11 +62,10 @@ export async function setupSuiClient() {
 		logger: (msg) => console.warn('Retrying requesting from faucet: ' + msg),
 	});
 
-	const configPath = path.join(
-		'/test-data',
-		`${Math.random().toString(36).substring(2, 15)}-client.yaml`,
-	);
-	await execSuiTools(['client', '--yes', '--client.config', configPath]);
+	const configDir = path.join('/test-data', `${Math.random().toString(36).substring(2, 15)}`);
+	await execSuiTools(['mkdir', '-p', configDir]);
+	const configPath = path.join(configDir, 'client.yaml');
+	await execSuiTools(['sui', 'client', '--yes', '--client.config', configPath]);
 	return new TestToolbox(keypair, client, configPath);
 }
 
@@ -77,6 +76,7 @@ export async function publishPackage(packageName: string, toolbox?: TestToolbox)
 	}
 
 	const result = await execSuiTools([
+		'sui',
 		'move',
 		'--client.config',
 		toolbox.configPath,
@@ -239,7 +239,7 @@ export async function execSuiTools(
 	const client = await getContainerRuntimeClient();
 	const container = client.container.getById(SUI_TOOLS_CONTAINER_ID);
 
-	const result = await client.container.exec(container, ['sui', ...command], options);
+	const result = await client.container.exec(container, command, options);
 
 	if (result.stderr) {
 		console.log(result.stderr);

diff --git a/packages/typescript/test/e2e/utils/setup.ts b/packages/typescript/test/e2e/utils/setup.ts
@@ -118,10 +118,9 @@ export async function setup(options: { graphQLURL?: string; rpcURL?: string } =
 	const keypair = Ed25519Keypair.generate();
 	const address = keypair.getPublicKey().toSuiAddress();
 
-	const configPath = path.join(
-		'/test-data',
-		`${Math.random().toString(36).substring(2, 15)}-client.yaml`,
-	);
+	const configDir = path.join('/test-data', `${Math.random().toString(36).substring(2, 15)}`);
+	await execSuiTools(['mkdir', '-p', configDir]);
+	const configPath = path.join(configDir, 'client.yaml');
 	return setupWithFundedAddress(keypair, address, configPath, options);
 }
 
@@ -159,7 +158,7 @@ export async function setupWithFundedAddress(
 		},
 	);
 
-	await execSuiTools(['client', '--yes', '--client.config', configPath]);
+	await execSuiTools(['sui', 'client', '--yes', '--client.config', configPath]);
 	return new TestToolbox(keypair, rpcURL, configPath);
 }
 
@@ -170,6 +169,7 @@ export async function publishPackage(packageName: string, toolbox?: TestToolbox)
 	}
 
 	const result = await execSuiTools([
+		'sui',
 		'move',
 		'--client.config',
 		toolbox.configPath,
@@ -235,6 +235,7 @@ export async function upgradePackage(
 		toolbox = await setup();
 	}
 	const { stdout } = await execSuiTools([
+		'sui',
 		'move',
 		'--client.config',
 		toolbox.configPath,
@@ -362,7 +363,7 @@ export async function execSuiTools(
 ) {
 	const container = client.container.getById(SUI_TOOLS_CONTAINER_ID);
 
-	const result = await client.container.exec(container, ['sui', ...command], options);
+	const result = await client.container.exec(container, command, options);
 
 	if (result.stderr) {
 		console.log(result.stderr);