From 608361ce20e3fd56295291cfbc9d7aa2f00aae87 Mon Sep 17 00:00:00 2001 From: Alexander Matyushentsev Date: Fri, 23 Aug 2019 14:11:45 -0700 Subject: [PATCH] Fix flaky TestOrphanedResource test (#2210) --- test/e2e/app_management_test.go | 8 ++------ test/e2e/fixture/app/expectation.go | 10 ++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/test/e2e/app_management_test.go b/test/e2e/app_management_test.go index b73529907a..635a801e18 100644 --- 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 index e54ab7f429..fd0efb3f23 100644 --- 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