Fix flaky TestOrphanedResource test (argoproj#2210)

mura-s · Aug 23, 2019 · 608361c · 608361c
1 parent 8b29b9c
commit 608361c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/test/e2e/app_management_test.go b/test/e2e/app_management_test.go
@@ -800,9 +800,7 @@ func TestOrphanedResource(t *testing.T) {
 		Sync().
 		Then().
 		Expect(SyncStatusIs(SyncStatusCodeSynced)).
-		And(func(app *Application) {
-			assert.Len(t, app.Status.Conditions, 0)
-		}).
+		Expect(NoConditions()).
 		When().
 		And(func() {
 			errors.FailOnErr(fixture.KubeClientset.CoreV1().ConfigMaps(fixture.DeploymentNamespace()).Create(&v1.ConfigMap{
@@ -824,7 +822,5 @@ func TestOrphanedResource(t *testing.T) {
 		Refresh(RefreshTypeNormal).
 		Then().
 		Expect(SyncStatusIs(SyncStatusCodeSynced)).
-		And(func(app *Application) {
-			assert.Len(t, app.Status.Conditions, 0)
-		})
+		Expect(NoConditions())
 }
diff --git a/test/e2e/fixture/app/expectation.go b/test/e2e/fixture/app/expectation.go
@@ -62,6 +62,16 @@ func Condition(conditionType ApplicationConditionType, conditionMessage string)
 	}
 }
 
+func NoConditions() Expectation {
+	return func(c *Consequences) (state, string) {
+		message := "no conditions"
+		if len(c.app().Status.Conditions) == 0 {
+			return succeeded, message
+		}
+		return pending, message
+	}
+}
+
 func HealthIs(expected HealthStatusCode) Expectation {
 	return func(c *Consequences) (state, string) {
 		actual := c.app().Status.Health.Status