chore: fix integration test

tektoncd · Mar 20, 2024 · f70eb31 · f70eb31
1 parent d7b8ab4
commit f70eb31
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/test/artifacts_test.go b/test/artifacts_test.go
@@ -53,14 +53,19 @@ func TestSurfaceArtifactsThroughTerminationMessage(t *testing.T) {
 	updateConfigMap(ctx, c.KubeClient, system.Namespace(), config.GetFeatureFlagsConfigName(), map[string]string{
 		"results-from": config.ResultExtractionMethodTerminationMessage,
 	})
-	t.Cleanup(func() {
+
+	knativetest.CleanupOnInterrupt(func() {
 		updateConfigMap(ctx, c.KubeClient, system.Namespace(), config.GetFeatureFlagsConfigName(), map[string]string{
 			"results-from": previous,
 		})
-	})
-
-	knativetest.CleanupOnInterrupt(func() { tearDown(ctx, t, c, namespace) }, t.Logf)
-	defer tearDown(ctx, t, c, namespace)
+		tearDown(ctx, t, c, namespace)
+	}, t.Logf)
+	defer func() {
+		updateConfigMap(ctx, c.KubeClient, system.Namespace(), config.GetFeatureFlagsConfigName(), map[string]string{
+			"results-from": previous,
+		})
+		tearDown(ctx, t, c, namespace)
+	}()
 
 	taskRunName := helpers.ObjectNameForTest(t)
 
@@ -123,15 +128,20 @@ func TestConsumeArtifact(t *testing.T) {
 	updateConfigMap(ctx, c.KubeClient, system.Namespace(), config.GetFeatureFlagsConfigName(), map[string]string{
 		"results-from": config.ResultExtractionMethodTerminationMessage,
 	})
-	t.Cleanup(func() {
+
+	knativetest.CleanupOnInterrupt(func() {
 		updateConfigMap(ctx, c.KubeClient, system.Namespace(), config.GetFeatureFlagsConfigName(), map[string]string{
 			"results-from": previous,
 		})
-	})
-
-	knativetest.CleanupOnInterrupt(func() { tearDown(ctx, t, c, namespace) }, t.Logf)
-	defer tearDown(ctx, t, c, namespace)
+		tearDown(ctx, t, c, namespace)
+	}, t.Logf)
 
+	defer func() {
+		updateConfigMap(ctx, c.KubeClient, system.Namespace(), config.GetFeatureFlagsConfigName(), map[string]string{
+			"results-from": previous,
+		})
+		tearDown(ctx, t, c, namespace)
+	}()
 	taskRunName := helpers.ObjectNameForTest(t)
 
 	fqImageName := getTestImage(busyboxImage)