From 3f3081e5eed36eda20187b964f0dccf40600fb8e Mon Sep 17 00:00:00 2001 From: zhaque44 Date: Mon, 10 Jul 2023 15:20:42 -0500 Subject: [PATCH] fixing 13398 by enhancing: RunCliWithRetry func Signed-off-by: zhaque44 --- test/e2e/app_management_ns_test.go | 1 - test/e2e/app_management_test.go | 1 - test/e2e/fixture/fixture.go | 11 +++++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/test/e2e/app_management_ns_test.go b/test/e2e/app_management_ns_test.go index 15cbd43534025..9fec5b9fa4440 100644 --- a/test/e2e/app_management_ns_test.go +++ b/test/e2e/app_management_ns_test.go @@ -2298,7 +2298,6 @@ definitions: } func TestNamespacedAppLogs(t *testing.T) { - SkipOnEnv(t, "OPENSHIFT") Given(t). SetAppNamespace(AppNamespace()). SetTrackingMethod("annotation"). diff --git a/test/e2e/app_management_test.go b/test/e2e/app_management_test.go index 054d02407a100..d79eb78d49413 100644 --- a/test/e2e/app_management_test.go +++ b/test/e2e/app_management_test.go @@ -2333,7 +2333,6 @@ definitions: } func TestAppLogs(t *testing.T) { - SkipOnEnv(t, "OPENSHIFT") Given(t). Path("guestbook-logs"). When(). diff --git a/test/e2e/fixture/fixture.go b/test/e2e/fixture/fixture.go index 095b3e2f116be..eeeb9a3b08ed3 100644 --- a/test/e2e/fixture/fixture.go +++ b/test/e2e/fixture/fixture.go @@ -672,13 +672,20 @@ func EnsureCleanState(t *testing.T, opts ...TestOption) { func RunCliWithRetry(maxRetries int, args ...string) (string, error) { var out string var err error + + out, err = RunCli(args...) + if err == nil { + return out, nil + } + for i := 0; i < maxRetries; i++ { + time.Sleep(time.Second) out, err = RunCli(args...) if err == nil { - break + return out, nil } - time.Sleep(time.Second) } + return out, err }