test: add killProcessAndPorts function (#729)

* test: add killProcessAndPorts function * build: work in progress --------- Co-authored-by: khalilou88 <[email protected]>
khalilou88 · Jan 3, 2024 · 28da0f6 · 28da0f6
1 parent 1626654
commit 28da0f6
Show file tree

Hide file tree

Showing 13 changed files with 125 additions and 560 deletions.
diff --git a/packages/internal/testing/src/lib/testing.ts b/packages/internal/testing/src/lib/testing.ts
@@ -129,7 +129,7 @@ export function runNxCommandUntil(
 
 const KILL_PORT_DELAY = 5000;
 
-export async function killPort(port: number): Promise<boolean> {
+async function killPort(port: number): Promise<boolean> {
   if (await portCheck(port)) {
     try {
       logInfo(`Attempting to close port ${port}`);
@@ -184,16 +184,24 @@ export function logError(title: string, body?: string) {
   return e2eConsoleLogger(message, body);
 }
 
-export async function killPorts(port?: number): Promise<boolean> {
-  return port
-    ? await killPort(port)
-    : (await killPort(3333)) && (await killPort(4200));
-}
+const promisifiedTreeKill: (pid: number, signal: string) => Promise<void> =
+  promisify(treeKill);
 
-export const promisifiedTreeKill: (
-  pid: number,
-  signal: string,
-) => Promise<void> = promisify(treeKill);
+export async function killProcessAndPorts(
+  pid: number | undefined,
+  ...ports: number[]
+): Promise<void> {
+  try {
+    if (pid) {
+      await promisifiedTreeKill(pid, 'SIGKILL');
+    }
+    for (const port of ports) {
+      await killPort(port);
+    }
+  } catch (err) {
+    // ignore err
+  }
+}
 
 export function checkFilesDoNotExist(...expectedFiles: string[]) {
   expectedFiles.forEach((f) => {

diff --git a/testing-projects/jnxplus-e2e/tests/nx-gradle/micronaut-kt.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-gradle/micronaut-kt.spec.ts
@@ -3,8 +3,7 @@ import {
   checkFilesDoNotExist,
   createTestWorkspace,
   getData,
-  killPorts,
-  promisifiedTreeKill,
+  killProcessAndPorts,
   runNxCommandUntil,
 } from '@jnxplus/internal/testing';
 import { names } from '@nx/devkit';
@@ -170,12 +169,7 @@ describe('nx-gradle micronaut kotlin dsl e2e', () => {
     expect(dataResult.message).toMatch('Hello World');
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 240000);
 
   it('should build-image of a java application', async () => {
@@ -270,12 +264,7 @@ describe('nx-gradle micronaut kotlin dsl e2e', () => {
     expect(dataResult.message).toMatch('Hello World');
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('should generate an app with a simple package name', async () => {
@@ -357,12 +346,7 @@ describe('nx-gradle micronaut kotlin dsl e2e', () => {
     expect(dataResult.message).toMatch('Hello World');
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('should create a kotlin application', async () => {
@@ -441,12 +425,7 @@ describe('nx-gradle micronaut kotlin dsl e2e', () => {
     expect(dataResult.message).toMatch('Hello World');
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 240000);
 
   xit('should build-image of a kotlin application', async () => {
@@ -541,12 +520,7 @@ describe('nx-gradle micronaut kotlin dsl e2e', () => {
     expect(dataResult.message).toMatch('Hello World');
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('directory with dash', async () => {
@@ -581,12 +555,7 @@ describe('nx-gradle micronaut kotlin dsl e2e', () => {
     expect(dataResult.message).toMatch('Hello World');
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('should create a library', async () => {
@@ -1119,12 +1088,7 @@ describe('nx-gradle micronaut kotlin dsl e2e', () => {
     expect(dataResult.message).toMatch('Hello World');
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('should create a library with a simple name', async () => {
@@ -1222,12 +1186,7 @@ describe('nx-gradle micronaut kotlin dsl e2e', () => {
     );
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('should create a minimal kotlin application', async () => {
@@ -1267,12 +1226,7 @@ describe('nx-gradle micronaut kotlin dsl e2e', () => {
     );
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('should skip starter code when generating a java library with skipStarterCode option', async () => {

diff --git a/testing-projects/jnxplus-e2e/tests/nx-gradle/micronaut.spec.ts b/testing-projects/jnxplus-e2e/tests/nx-gradle/micronaut.spec.ts
@@ -3,8 +3,7 @@ import {
   checkFilesDoNotExist,
   createTestWorkspace,
   getData,
-  killPorts,
-  promisifiedTreeKill,
+  killProcessAndPorts,
   runNxCommandUntil,
 } from '@jnxplus/internal/testing';
 import { names } from '@nx/devkit';
@@ -170,12 +169,7 @@ describe('nx-gradle micronaut e2e', () => {
     expect(dataResult.message).toMatch('Hello World');
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('should build-image of a java application', async () => {
@@ -270,12 +264,7 @@ describe('nx-gradle micronaut e2e', () => {
     expect(dataResult.message).toMatch('Hello World');
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('should generate an app with a simple package name', async () => {
@@ -357,12 +346,7 @@ describe('nx-gradle micronaut e2e', () => {
     expect(dataResult.message).toMatch('Hello World');
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('should create a kotlin application', async () => {
@@ -441,12 +425,7 @@ describe('nx-gradle micronaut e2e', () => {
     expect(dataResult.message).toMatch('Hello World');
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 240000);
 
   xit('should build-image of a kotlin application', async () => {
@@ -541,12 +520,7 @@ describe('nx-gradle micronaut e2e', () => {
     expect(dataResult.message).toMatch('Hello World');
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('directory with dash', async () => {
@@ -581,12 +555,7 @@ describe('nx-gradle micronaut e2e', () => {
     expect(dataResult.message).toMatch('Hello World');
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('should create a library', async () => {
@@ -1119,12 +1088,7 @@ describe('nx-gradle micronaut e2e', () => {
     expect(dataResult.message).toMatch('Hello World');
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('should create a library with a simple name', async () => {
@@ -1222,12 +1186,7 @@ describe('nx-gradle micronaut e2e', () => {
     );
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('should create a minimal kotlin application', async () => {
@@ -1267,12 +1226,7 @@ describe('nx-gradle micronaut e2e', () => {
     );
 
     // port and process cleanup
-    try {
-      await promisifiedTreeKill(process.pid, 'SIGKILL');
-      await killPorts(port);
-    } catch (err) {
-      // ignore err
-    }
+    await killProcessAndPorts(process.pid, port);
   }, 120000);
 
   it('should skip starter code when generating a java library with skipStarterCode option', async () => {