From b6d75b045ee902eea6e399b25e293d0c9cd956d7 Mon Sep 17 00:00:00 2001
From: Artem Derevnjuk <artem.derevnjuk@brightsec.com>
Date: Thu, 18 Apr 2024 19:37:20 +0400
Subject: [PATCH] test(e2e): ensure target application resets after each test
 execution (#543)

---
 tests/Commands/repeater.spec.ts | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/tests/Commands/repeater.spec.ts b/tests/Commands/repeater.spec.ts
index 001c4588..b90e5e68 100644
--- a/tests/Commands/repeater.spec.ts
+++ b/tests/Commands/repeater.spec.ts
@@ -32,7 +32,15 @@ describe('Repeater Command', () => {
       baseUrl: `https://${config.cluster}`,
       apiKey: config.apiKey
     });
+  });
 
+  afterAll(() => {
+    targetProcess.stderr.destroy();
+    targetProcess.stdout.destroy();
+    targetProcess.kill('SIGTERM');
+  });
+
+  beforeEach(async () => {
     const [targetCmd, ...targetArgs]: string[] = config.targetCmd.split(' ');
     targetProcess = spawn(targetCmd, targetArgs, {
       shell: true,
@@ -44,15 +52,7 @@ describe('Repeater Command', () => {
 
     targetProcess.stdout.pipe(process.stdout);
     targetProcess.stderr.pipe(process.stderr);
-  });
 
-  afterAll(() => {
-    targetProcess.stderr.destroy();
-    targetProcess.stdout.destroy();
-    targetProcess.kill('SIGTERM');
-  });
-
-  beforeEach(async () => {
     repeaterId = await api.createRepeater(name);
   }, 10000);
 
@@ -63,6 +63,12 @@ describe('Repeater Command', () => {
       commandProcess.kill('SIGTERM');
     }
 
+    if (targetProcess) {
+      targetProcess.stderr.destroy();
+      targetProcess.stdout.destroy();
+      targetProcess.kill('SIGTERM');
+    }
+
     await api.deleteRepeater(repeaterId);
   }, 10000);