From cec694b2a321bcf441ac401c39771a2b64d3e6c0 Mon Sep 17 00:00:00 2001 From: Sascha Schwarze Date: Wed, 21 Oct 2020 13:45:36 +0200 Subject: [PATCH] Early exit Eventually block if target condition cannot be reached anymore --- test/e2e/validators.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/e2e/validators.go b/test/e2e/validators.go index 235210125a..3ab9686316 100644 --- a/test/e2e/validators.go +++ b/test/e2e/validators.go @@ -183,6 +183,7 @@ func validateBuildRunToSucceed( f := framework.Global trueCondition := corev1.ConditionTrue + falseCondition := corev1.ConditionFalse // Ensure the BuildRun has been created err := f.Client.Create(goctx.TODO(), testBuildRun, cleanupOptions(ctx, timeout, retry)) @@ -195,6 +196,8 @@ func validateBuildRunToSucceed( err = clientGet(buildRunNsName, testBuildRun) Expect(err).ToNot(HaveOccurred(), "Error retrieving a buildRun") + Expect(testBuildRun.Status.Succeeded).ToNot(Equal(falseCondition)) + return testBuildRun.Status.Succeeded }, time.Duration(1100*getTimeoutMultiplier())*time.Second, 5*time.Second).Should(Equal(trueCondition), "BuildRun did not succeed") @@ -215,6 +218,8 @@ func validateBuildRunToFail( retry time.Duration, ) { f := framework.Global + + trueCondition := corev1.ConditionTrue falseCondition := corev1.ConditionFalse // Create the BuildRun @@ -227,6 +232,8 @@ func validateBuildRunToFail( err = clientGet(buildRunNsName, testBuildRun) Expect(err).ToNot(HaveOccurred(), "Error retrieving build run") + Expect(testBuildRun.Status.Succeeded).ToNot(Equal(trueCondition)) + return testBuildRun.Status.Succeeded }, time.Duration(550*getTimeoutMultiplier())*time.Second, 5*time.Second).Should(Equal(falseCondition), "BuildRun did not fail")