Merge pull request #3496 from threefoldtech/development_fix_vm_k8s_te…

…sts_repreated_name_issue
threefoldtech · Oct 3, 2024 · b5a33fa · b5a33fa
2 parents 535487c + e6d17a3
commit b5a33fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/packages/grid_client/tests/modules/kubernetes.test.ts b/packages/grid_client/tests/modules/kubernetes.test.ts
@@ -15,7 +15,7 @@ jest.setTimeout(500000);
 let gridClient: GridClient;
 let deploymentName: string;
 
-beforeAll(async () => {
+beforeEach(async () => {
   gridClient = await getClient();
   deploymentName = generateString(15);
   gridClient.clientOptions.projectName = `kubernetes/${deploymentName}`;
@@ -743,8 +743,5 @@ afterEach(async () => {
     expect(res.updated).toHaveLength(0);
     expect(res.deleted).toBeDefined();
   }
-});
-
-afterAll(async () => {
   return await gridClient.disconnect();
 }, 130000);
diff --git a/packages/grid_client/tests/modules/vm.test.ts b/packages/grid_client/tests/modules/vm.test.ts
@@ -7,7 +7,7 @@ jest.setTimeout(300000);
 let gridClient: GridClient;
 let deploymentName: string;
 
-beforeAll(async () => {
+beforeEach(async () => {
   gridClient = await getClient();
   deploymentName = generateString(15);
   gridClient.clientOptions.projectName = `vm/${deploymentName}`;
@@ -568,7 +568,7 @@ test("TC1230 - VM: Deploy Multiple VMs on Different Nodes", async () => {
   }
 });
 
-afterEach(async () => {
+afterAll(async () => {
   const vmNames = await gridClient.machines.list();
   for (const name of vmNames) {
     const res = await gridClient.machines.delete({ name });
@@ -577,8 +577,5 @@ afterEach(async () => {
     expect(res.updated).toHaveLength(0);
     expect(res.deleted).toBeDefined();
   }
-});
-
-afterAll(async () => {
   return await gridClient.disconnect();
 }, 130000);