fixin: stop.test.ts

MatrixAI · Jul 26, 2022 · e78a1d2 · e78a1d2
1 parent 35f2e98
commit e78a1d2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/tests/bin/agent/stop.test.ts b/tests/bin/agent/stop.test.ts
@@ -27,7 +27,7 @@ describe('stop', () => {
     'stop LIVE agent',
     async () => {
       const password = 'abc123';
-      const { exitCode } = await testBinUtils.pkStdioSwitch(global.testCmd)(
+      const agentProcess = await testBinUtils.pkSpawnSwitch(global.testCmd)(
         [
           'agent',
           'start',
@@ -46,8 +46,8 @@ describe('stop', () => {
           PK_PASSWORD: password,
         },
         dataDir,
+        logger,
       );
-      expect(exitCode).toBe(0);
       const status = new Status({
         statusPath: path.join(dataDir, 'polykey', config.defaults.statusBase),
         statusLockPath: path.join(
@@ -58,6 +58,7 @@ describe('stop', () => {
         fs,
         logger,
       });
+      await status.waitFor('LIVE');
       await testBinUtils.pkStdioSwitch(global.testCmd)(
         ['agent', 'stop'],
         {
@@ -67,6 +68,8 @@ describe('stop', () => {
         dataDir,
       );
       await status.waitFor('DEAD');
+      await sleep(5000);
+      agentProcess.kill();
     },
     global.defaultTimeout * 2,
   );
@@ -86,7 +89,7 @@ describe('stop', () => {
         fs,
         logger,
       });
-      const { exitCode } = await testBinUtils.pkStdioSwitch(global.testCmd)(
+      const agentProcess = await testBinUtils.pkSpawnSwitch(global.testCmd)(
         [
           'agent',
           'start',
@@ -105,8 +108,8 @@ describe('stop', () => {
           PK_PASSWORD: password,
         },
         dataDir,
+        logger,
       );
-      expect(exitCode).toBe(0);
       await status.waitFor('LIVE');
       // Simultaneous calls to stop must use pkExec
       const [agentStop1, agentStop2] = await Promise.all([
@@ -156,6 +159,7 @@ describe('stop', () => {
       }
       expect(agentStop3.exitCode).toBe(0);
       expect(agentStop4.exitCode).toBe(0);
+      agentProcess.kill();
     },
     global.defaultTimeout * 2,
   );
@@ -173,7 +177,7 @@ describe('stop', () => {
         fs,
         logger,
       });
-      await testBinUtils.pkSpawnSwitch(global.testCmd)(
+      const agentProcess = await testBinUtils.pkSpawnSwitch(global.testCmd)(
         [
           'agent',
           'start',
@@ -196,7 +200,9 @@ describe('stop', () => {
         logger,
       );
       await status.waitFor('STARTING');
-      const { exitCode, stderr } = await testBinUtils.pkStdioSwitch(global.testCmd)(
+      const { exitCode, stderr } = await testBinUtils.pkStdioSwitch(
+        global.testCmd,
+      )(
         ['agent', 'stop', '--format', 'json'],
         {
           PK_NODE_PATH: path.join(dataDir, 'polykey'),
@@ -216,14 +222,15 @@ describe('stop', () => {
         dataDir,
       );
       await status.waitFor('DEAD');
+      agentProcess.kill();
     },
     global.defaultTimeout * 2,
   );
   runTestIfPlatforms('linux', 'docker')(
     'stopping while unauthenticated does not stop',
     async () => {
       const password = 'abc123';
-      await testBinUtils.pkStdioSwitch(global.testCmd)(
+      const agentProcess = await testBinUtils.pkSpawnSwitch(global.testCmd)(
         [
           'agent',
           'start',
@@ -242,6 +249,7 @@ describe('stop', () => {
           PK_PASSWORD: password,
         },
         dataDir,
+        logger,
       );
       const status = new Status({
         statusPath: path.join(dataDir, 'polykey', config.defaults.statusBase),
@@ -253,7 +261,10 @@ describe('stop', () => {
         fs,
         logger,
       });
-      const { exitCode, stderr } = await testBinUtils.pkStdioSwitch(global.testCmd)(
+      await status.waitFor('LIVE');
+      const { exitCode, stderr } = await testBinUtils.pkStdioSwitch(
+        global.testCmd,
+      )(
         ['agent', 'stop', '--format', 'json'],
         {
           PK_NODE_PATH: path.join(dataDir, 'polykey'),
@@ -265,10 +276,7 @@ describe('stop', () => {
         new clientErrors.ErrorClientAuthDenied(),
       ]);
       // Should still be LIVE
-      await sleep(500);
-      const statusInfo = await status.readStatus();
-      expect(statusInfo).toBeDefined();
-      expect(statusInfo?.status).toBe('LIVE');
+      expect((await status.readStatus())?.status).toBe('LIVE');
       await testBinUtils.pkStdioSwitch(global.testCmd)(
         ['agent', 'stop'],
         {
@@ -278,6 +286,7 @@ describe('stop', () => {
         dataDir,
       );
       await status.waitFor('DEAD');
+      agentProcess.kill();
     },
     global.defaultTimeout * 2,
   );

diff --git a/tests/bin/utils.ts b/tests/bin/utils.ts
@@ -331,9 +331,10 @@ async function pkExecTarget(
   // (if not defined in the env) to ensure no attempted connections. A regular
   // PolykeyAgent is expected to initially connect to the mainnet seed nodes
   env['PK_SEED_NODES'] = env['PK_SEED_NODES'] ?? '';
+  const command = path.resolve(path.join(global.projectDir, cmd));
   return new Promise((resolve, reject) => {
     child_process.execFile(
-      cmd,
+      command,
       [...args],
       {
         env,