Fix cleanup order

kubeshop · Jun 24, 2024 · f227f6a · f227f6a
1 parent 25b30f2
commit f227f6a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/test/cloud-slack-dev-e2e/botkube_page_helpers_test.go b/test/cloud-slack-dev-e2e/botkube_page_helpers_test.go
@@ -253,7 +253,7 @@ func (p *BotkubeCloudPage) openKubectlUpdateForm() {
 	p.page.Screenshot("after-selecting-kubectl-cfg-form")
 }
 
-func (p *BotkubeCloudPage) CleanupOnFail(t *testing.T, gqlCli *cloud_graphql.Client) {
+func (p *BotkubeCloudPage) Cleanup(t *testing.T, gqlCli *cloud_graphql.Client) {
 	t.Log("Cleaning up Botkube instance on test failure...")
 
 	if p.ConnectedDeploy == nil {

diff --git a/test/cloud-slack-dev-e2e/cloud_slack_dev_e2e_test.go b/test/cloud-slack-dev-e2e/cloud_slack_dev_e2e_test.go
@@ -149,18 +149,19 @@ func TestCloudSlackE2E(t *testing.T) {
 	botkubeCloudPage.HideCookieBanner(t)
 
 	botkubeCloudPage.CreateNewInstance(t, channel.Name())
-	t.Cleanup(func() {
-		gqlCli := createGQLCli(t, cfg, botkubeCloudPage)
-		botkubeCloudPage.CleanupOnFail(t, gqlCli)
-	})
 
 	botkubeCloudPage.InstallAgentInCluster(t, cfg.BotkubeCliBinaryPath)
 	botkubeCloudPage.OpenSlackAppIntegrationPage(t)
 
 	slackPage.ConnectWorkspace(t, browser)
 	t.Cleanup(func() {
 		gqlCli := createGQLCli(t, cfg, botkubeCloudPage)
-		slackPage.CleanupOnFail(t, gqlCli)
+		slackPage.Cleanup(t, gqlCli)
+	})
+
+	t.Cleanup(func() {
+		gqlCli := createGQLCli(t, cfg, botkubeCloudPage)
+		botkubeCloudPage.Cleanup(t, gqlCli)
 	})
 
 	botkubeCloudPage.ReAddSlackPlatformIfShould(t, isHeadless)
@@ -178,15 +179,11 @@ func TestCloudSlackE2E(t *testing.T) {
 
 		connectedDeploy := botkubeCloudPage.ConnectedDeploy
 		require.NotNil(t, connectedDeploy, "Previous subtest needs to pass to get connected deployment information")
-		t.Cleanup(func() {
-			deleteDeployment(t, gqlCli, connectedDeploy.ID, "first (connected)")
-		})
+		// cleanup is done in the upper test function
 
 		slackWorkspace := findConnectedSlackWorkspace(t, cfg, gqlCli)
-		t.Cleanup(func() {
-			disconnectConnectedSlackWorkspace(t, cfg, gqlCli, slackWorkspace)
-		})
 		require.NotNil(t, slackWorkspace)
+		// cleanup is done in the upper test function
 
 		t.Log("Creating a second deployment to test not connected flow...")
 		notConnectedDeploy := gqlCli.MustCreateBasicDeploymentWithCloudSlack(t, fmt.Sprintf("%s-2", channel.Name()), slackWorkspace.TeamID, channel.Name())

diff --git a/test/cloud-slack-dev-e2e/page_helpers_test.go b/test/cloud-slack-dev-e2e/page_helpers_test.go
@@ -74,7 +74,7 @@ func closePage(t *testing.T, name string, page *rod.Page) {
 	t.Helper()
 	err := page.Close()
 	if err != nil {
-		if errors.Is(err, context.Canceled) {
+		if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
 			return
 		}
 

diff --git a/test/cloud-slack-dev-e2e/slack_page_helpers_test.go b/test/cloud-slack-dev-e2e/slack_page_helpers_test.go
@@ -94,17 +94,12 @@ func (p *SlackPage) ConnectWorkspace(t *testing.T, browser *rod.Browser) {
 	assert.NoError(t, err)
 }
 
-func (p *SlackPage) CleanupOnFail(t *testing.T, gqlCli *cloud_graphql.Client) {
+func (p *SlackPage) Cleanup(t *testing.T, gqlCli *cloud_graphql.Client) {
 	t.Log("Cleaning up Slack workspace on test failure...")
 	if !p.cfg.Slack.DisconnectWorkspaceAfterTests {
 		return
 	}
 
-	if !t.Failed() {
-		t.Log("Skipping Slack workspace cleanup as the subtest passed...")
-		return
-	}
-
 	slackWorkspace := findConnectedSlackWorkspace(t, p.cfg, gqlCli)
 	disconnectConnectedSlackWorkspace(t, p.cfg, gqlCli, slackWorkspace)
 }