Reusing controller methods

weaveworks · Oct 25, 2023 · 96a6711 · 96a6711
1 parent 66ade3c
commit 96a6711
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/controllers/leveltriggered/controller_test.go b/controllers/leveltriggered/controller_test.go
@@ -210,11 +210,13 @@ func TestReconcile(t *testing.T) {
 		g.Eventually(func() bool {
 			p := getPipeline(ctx, g, client.ObjectKeyFromObject(pipeline))
 
-			for _, env := range p.Status.Environments {
-				for _, target := range env.Targets {
-					if target.Revision != versionToPromote {
-						return false
-					}
+			for _, env := range p.Spec.Environments {
+				if !checkAllTargetsRunRevision(p.Status.Environments[env.Name], versionToPromote) {
+					return false
+				}
+
+				if !checkAllTargetsAreReady(p.Status.Environments[env.Name]) {
+					return false
 				}
 			}
 
@@ -229,11 +231,9 @@ func TestReconcile(t *testing.T) {
 			g.Eventually(func() bool {
 				p := getPipeline(ctx, g, client.ObjectKeyFromObject(pipeline))
 
-				for _, env := range p.Status.Environments {
-					for _, target := range env.Targets {
-						if target.Revision != "v1.0.2" {
-							return false
-						}
+				for _, env := range p.Spec.Environments {
+					if !checkAllTargetsRunRevision(p.Status.Environments[env.Name], "v1.0.2") {
+						return false
 					}
 				}