Merge pull request #958 from weaveworks/947-fix-test-201

fix: controller test 201 and fix test clean-up
flux-iac · Sep 13, 2023 · aca6f62 · aca6f62
2 parents 856cbf8 + 99da532
commit aca6f62
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/controllers/cleaner_test.go b/controllers/cleaner_test.go
@@ -29,7 +29,7 @@ func waitResourceToBeDelete(g gomega.Gomega, resource client.Object) {
  return k8sClient.Get(ctx, key, resource)
  }, cleanupTimeoutSeconds, interval).ShouldNot(gomega.Succeed())
 
- if resource.GetObjectKind().GroupVersionKind().Kind == infrav1.TerraformKind {
+ if _, ok := resource.(*infrav1.Terraform); ok {
  waitDefaultSecretsToBeDeletedForTerraform(g, resource)
  }
 }

diff --git a/controllers/tc000201_auto_approve_with_disabled_drift_detection_test.go b/controllers/tc000201_auto_approve_with_disabled_drift_detection_test.go
@@ -1,5 +1,3 @@
-//go:build flaky
-
 package controllers
 
 import (
@@ -44,7 +42,7 @@ func Test_000201_auto_approve_with_disabled_drift_detection(t *testing.T) {
  },
  }
  g.Expect(k8sClient.Create(ctx, &testRepo)).Should(Succeed())
- defer func() { g.Expect(k8sClient.Delete(ctx, &testRepo)).Should(Succeed()) }()
+ defer waitResourceToBeDelete(g, &testRepo)
 
  By("setting the git repo status object, the URL, and the correct checksum")
  testRepo.Status = sourcev1.GitRepositoryStatus{
@@ -101,7 +99,7 @@ func Test_000201_auto_approve_with_disabled_drift_detection(t *testing.T) {
  },
  }
  g.Expect(k8sClient.Create(ctx, &helloWorldTF)).Should(Succeed())
- defer func() { g.Expect(k8sClient.Delete(ctx, &helloWorldTF)).Should(Succeed()) }()
+ defer waitResourceToBeDelete(g, &helloWorldTF)
 
  By("checking that the hello world TF gets created")
  helloWorldTFKey := types.NamespacedName{Namespace: "flux-system", Name: terraformName}