From 6bf686fc0e62ea13ff31452478025948c035dd99 Mon Sep 17 00:00:00 2001 From: David Simansky Date: Thu, 14 Mar 2024 10:39:30 +0100 Subject: [PATCH 1/2] WIP: E2E test wait loop debug --- test/e2e/domain_mapping_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/e2e/domain_mapping_test.go b/test/e2e/domain_mapping_test.go index 0d64c7d746..6cb92b737f 100644 --- a/test/e2e/domain_mapping_test.go +++ b/test/e2e/domain_mapping_test.go @@ -28,6 +28,7 @@ import ( "math/big" "os" "path/filepath" + "strings" "testing" "time" @@ -137,7 +138,9 @@ func domainDescribe(r *test.KnRunResultCollector, domainName string, tls bool) { for i := 0; i < 20; i++ { out, err := k.Run("get", "domainmapping", domainName, "-o=jsonpath='{.status.url}'") assert.NilError(r.T(), err) + out = strings.TrimSpace(out) if len(out) > 0 { + println("DEBUG wait loop:" + out + "|DEBUG") break } time.Sleep(time.Second) From ddd343cbe44a9545f5bbb264f701105ed9efc8c5 Mon Sep 17 00:00:00 2001 From: David Simansky Date: Fri, 15 Mar 2024 15:15:18 +0100 Subject: [PATCH 2/2] Remove additional single quotation marks --- test/e2e/domain_mapping_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/domain_mapping_test.go b/test/e2e/domain_mapping_test.go index 6cb92b737f..e6f9f0ef87 100644 --- a/test/e2e/domain_mapping_test.go +++ b/test/e2e/domain_mapping_test.go @@ -138,9 +138,9 @@ func domainDescribe(r *test.KnRunResultCollector, domainName string, tls bool) { for i := 0; i < 20; i++ { out, err := k.Run("get", "domainmapping", domainName, "-o=jsonpath='{.status.url}'") assert.NilError(r.T(), err) - out = strings.TrimSpace(out) + // Remove additional spaces and single quotes added to kubectl output + out = strings.Trim(strings.TrimSpace(out), "'") if len(out) > 0 { - println("DEBUG wait loop:" + out + "|DEBUG") break } time.Sleep(time.Second)