fix: updated bootstrap.test.ts to use #410 changes

MatrixAI · Jul 12, 2022 · 8e5e3b6 · 8e5e3b6
1 parent e7e6ad0
commit 8e5e3b6
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/tests/bin/bootstrap.test.ts b/tests/bin/bootstrap.test.ts
@@ -29,7 +29,9 @@ describe('bootstrap', () => {
       const password = 'password';
       const passwordPath = path.join(dataDir, 'password');
       await fs.promises.writeFile(passwordPath, password);
-      const { exitCode, stdout } = await testBinUtils.pkStdio(
+      const { exitCode, stdout } = await testBinUtils.pkStdioSwitch(
+        global.testCmd,
+      )(
         [
           'bootstrap',
           '--password-file',
@@ -60,7 +62,9 @@ describe('bootstrap', () => {
       await fs.promises.mkdir(path.join(dataDir, 'polykey'));
       await fs.promises.writeFile(path.join(dataDir, 'polykey', 'test'), '');
       let exitCode, stdout, stderr;
-      ({ exitCode, stdout, stderr } = await testBinUtils.pkStdio(
+      ({ exitCode, stdout, stderr } = await testBinUtils.pkStdioSwitch(
+        global.testCmd,
+      )(
         [
           'bootstrap',
           '--node-path',
@@ -82,7 +86,9 @@ describe('bootstrap', () => {
       testBinUtils.expectProcessError(exitCode, stderr, [
         errorBootstrapExistingState,
       ]);
-      ({ exitCode, stdout, stderr } = await testBinUtils.pkStdio(
+      ({ exitCode, stdout, stderr } = await testBinUtils.pkStdioSwitch(
+        global.testCmd,
+      )(
         [
           'bootstrap',
           '--node-path',
@@ -112,7 +118,7 @@ describe('bootstrap', () => {
     async () => {
       const password = 'password';
       const [bootstrapProcess1, bootstrapProcess2] = await Promise.all([
-        testBinUtils.pkSpawn(
+        testBinUtils.pkSpawnSwitch(global.testCmd)(
           [
             'bootstrap',
             '--root-key-pair-bits',
@@ -129,7 +135,7 @@ describe('bootstrap', () => {
           dataDir,
           logger.getChild('bootstrapProcess1'),
         ),
-        testBinUtils.pkSpawn(
+        testBinUtils.pkSpawnSwitch(global.testCmd)(
           [
             'bootstrap',
             '--root-key-pair-bits',
@@ -194,7 +200,9 @@ describe('bootstrap', () => {
     'bootstrap when interrupted, requires fresh on next bootstrap',
     async () => {
       const password = 'password';
-      const bootstrapProcess1 = await testBinUtils.pkSpawn(
+      const bootstrapProcess1 = await testBinUtils.pkSpawnSwitch(
+        global.testCmd,
+      )(
         ['bootstrap', '--root-key-pair-bits', '1024', '--verbose'],
         {
           PK_TEST_DATA_PATH: dataDir,
@@ -219,10 +227,12 @@ describe('bootstrap', () => {
         });
       });
       await new Promise((res) => {
-        bootstrapProcess1.once('exit', () => res(null))
-      })
+        bootstrapProcess1.once('exit', () => res(null));
+      });
       // Attempting to bootstrap should fail with existing state
-      const bootstrapProcess2 = await testBinUtils.pkStdio(
+      const bootstrapProcess2 = await testBinUtils.pkStdioSwitch(
+        global.testCmd,
+      )(
         [
           'bootstrap',
           '--root-key-pair-bits',
@@ -246,7 +256,9 @@ describe('bootstrap', () => {
         [errorBootstrapExistingState],
       );
       // Attempting to bootstrap with --fresh should succeed
-      const bootstrapProcess3 = await testBinUtils.pkStdio(
+      const bootstrapProcess3 = await testBinUtils.pkStdioSwitch(
+        global.testCmd,
+      )(
         ['bootstrap', '--root-key-pair-bits', '1024', '--fresh', '--verbose'],
         {
           PK_TEST_DATA_PATH: dataDir,