From 69ce254b8195d550e52157f5a8824327647c1020 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <smalton@mirantis.com>
Date: Tue, 9 Feb 2021 11:12:45 -0500
Subject: [PATCH] remove unneccessary shorter timeouts on before* handles in
 integration tests

Signed-off-by: Sebastian Malton <smalton@mirantis.com>
---
 integration/__tests__/app.tests.ts             |  2 +-
 integration/__tests__/cluster-pages.tests.ts   | 16 ++++++++--------
 integration/__tests__/command-palette.tests.ts |  2 +-
 integration/__tests__/workspace.tests.ts       |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/integration/__tests__/app.tests.ts b/integration/__tests__/app.tests.ts
index ddd69a0c5d..fa637efb45 100644
--- a/integration/__tests__/app.tests.ts
+++ b/integration/__tests__/app.tests.ts
@@ -15,7 +15,7 @@ describe("Lens integration tests", () => {
   describe("app start", () => {
     beforeAll(async () => {
       app = await utils.appStart();
-    }, 20000);
+    });
 
     beforeEach(() => {
       abortContoller = new AbortController();
diff --git a/integration/__tests__/cluster-pages.tests.ts b/integration/__tests__/cluster-pages.tests.ts
index 3c6aaaf52a..59504762af 100644
--- a/integration/__tests__/cluster-pages.tests.ts
+++ b/integration/__tests__/cluster-pages.tests.ts
@@ -34,7 +34,7 @@ describe("Lens cluster pages", () => {
     };
 
     describe("cluster add", () => {
-      beforeAll(async () => app = await utils.appStart(), 20000);
+      beforeAll(async () => app = await utils.appStart());
 
       afterAll(async () => {
         if (app?.isRunning()) {
@@ -56,7 +56,7 @@ describe("Lens cluster pages", () => {
     };
 
     describe("cluster menu pages", () => {
-      beforeAll(appStartAddCluster, 40000);
+      beforeAll(appStartAddCluster);
 
       afterAll(async () => {
         if (app?.isRunning()) {
@@ -437,16 +437,16 @@ describe("Lens cluster pages", () => {
       let abortContoller: AbortController;
 
       beforeEach(async () => {
-        await appStartAddCluster();
         abortContoller = new AbortController();
-      }, 40000);
+        await appStartAddCluster();
+      });
 
       afterEach(async () => {
-        if (app?.isRunning()) {
+        abortContoller.abort();
+        
+	if (app?.isRunning()) {
           await utils.tearDown(app);
         }
-
-        abortContoller.abort();
       });
 
       it("shows a logs for a pod", async () => {
@@ -485,7 +485,7 @@ describe("Lens cluster pages", () => {
     });
 
     describe("cluster operations", () => {
-      beforeEach(appStartAddCluster, 40000);
+      beforeEach(appStartAddCluster);
 
       afterEach(async () => {
         if (app?.isRunning()) {
diff --git a/integration/__tests__/command-palette.tests.ts b/integration/__tests__/command-palette.tests.ts
index 789806c445..61f534ed51 100644
--- a/integration/__tests__/command-palette.tests.ts
+++ b/integration/__tests__/command-palette.tests.ts
@@ -7,7 +7,7 @@ describe("Lens command palette", () => {
   let app: Application;
 
   describe("menu", () => {
-    beforeAll(async () => app = await utils.appStart(), 20000);
+    beforeAll(async () => app = await utils.appStart());
 
     afterAll(async () => {
       if (app?.isRunning()) {
diff --git a/integration/__tests__/workspace.tests.ts b/integration/__tests__/workspace.tests.ts
index 4164151b0f..ded374f7b2 100644
--- a/integration/__tests__/workspace.tests.ts
+++ b/integration/__tests__/workspace.tests.ts
@@ -16,7 +16,7 @@ describe("Lens integration tests", () => {
     beforeAll(async () => {
       app = await utils.appStart();
       await utils.clickWhatsNew(app);
-    }, 20000);
+    });
 
     afterAll(async () => {
       if (app && app.isRunning()) {