From 1929420de840a540863b0ffa8fc6bcb231cb99fd Mon Sep 17 00:00:00 2001 From: NiniOak Date: Wed, 20 Mar 2024 22:07:17 +0000 Subject: [PATCH 1/3] backport of commit 6e6f4c946ac4e0658bd8443bec99283ede4a958b --- acceptance/framework/helpers/helpers.go | 8 ++++++-- acceptance/tests/api-gateway/api_gateway_test.go | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/acceptance/framework/helpers/helpers.go b/acceptance/framework/helpers/helpers.go index f3d81f936c..9a0837ddf5 100644 --- a/acceptance/framework/helpers/helpers.go +++ b/acceptance/framework/helpers/helpers.go @@ -224,9 +224,13 @@ func RunCommand(t testutil.TestingTB, options *k8s.KubectlOptions, command Comma select { case res := <-resultCh: - return res.output, res.err + if res.err != nil { + resErr := fmt.Errorf("error: %v\nOutput: %s", res.err, res.output) + return "", resErr + } + return res.output, nil // Sometimes this func runs for too long handle timeout if needed. - case <-time.After(320 * time.Second): + case <-time.After(400 * time.Second): GetCRDRemoveFinalizers(t, options) logger.Logf(t, "RunCommand timed out") return "", nil diff --git a/acceptance/tests/api-gateway/api_gateway_test.go b/acceptance/tests/api-gateway/api_gateway_test.go index 721bbf2527..83f66cbafd 100644 --- a/acceptance/tests/api-gateway/api_gateway_test.go +++ b/acceptance/tests/api-gateway/api_gateway_test.go @@ -106,11 +106,14 @@ func TestAPIGateway_Basic(t *testing.T) { logger.Log(t, "creating static-client pod") k8s.DeployKustomize(t, ctx.KubectlOptions(t), cfg.NoCleanupOnFailure, cfg.NoCleanup, cfg.DebugDirectory, "../fixtures/bases/static-client") + k8s.RunKubectl(t, ctx.KubectlOptions(t), "wait", "--for=condition=available", "--timeout=5m", fmt.Sprintf("deploy/%s", "static-server")) + logger.Log(t, "patching route to target http server") k8s.RunKubectl(t, ctx.KubectlOptions(t), "patch", "httproute", "http-route", "-p", `{"spec":{"rules":[{"backendRefs":[{"name":"static-server","port":80}]}]}}`, "--type=merge") logger.Log(t, "creating target tcp server") k8s.DeployKustomize(t, ctx.KubectlOptions(t), cfg.NoCleanupOnFailure, cfg.NoCleanup, cfg.DebugDirectory, "../fixtures/bases/static-server-tcp") + k8s.RunKubectl(t, ctx.KubectlOptions(t), "wait", "--for=condition=available", "--timeout=5m", fmt.Sprintf("deploy/%s", "static-server-tcp")) logger.Log(t, "creating tcp-route") k8s.RunKubectl(t, ctx.KubectlOptions(t), "apply", "-f", "../fixtures/cases/api-gateways/tcproute/route.yaml") From 07f1ff733464c46edac21321586e0e18d2d6f76c Mon Sep 17 00:00:00 2001 From: NiniOak Date: Wed, 20 Mar 2024 22:15:35 +0000 Subject: [PATCH 2/3] backport of commit b3e66a8a0473b3321c6271a26c94871debb00967 --- acceptance/framework/helpers/helpers.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance/framework/helpers/helpers.go b/acceptance/framework/helpers/helpers.go index 9a0837ddf5..aeaf431e33 100644 --- a/acceptance/framework/helpers/helpers.go +++ b/acceptance/framework/helpers/helpers.go @@ -230,7 +230,7 @@ func RunCommand(t testutil.TestingTB, options *k8s.KubectlOptions, command Comma } return res.output, nil // Sometimes this func runs for too long handle timeout if needed. - case <-time.After(400 * time.Second): + case <-time.After(320 * time.Second): GetCRDRemoveFinalizers(t, options) logger.Logf(t, "RunCommand timed out") return "", nil From 33ee98b499f60077cded0939dd564790f8e0a52c Mon Sep 17 00:00:00 2001 From: NiniOak Date: Wed, 20 Mar 2024 22:55:30 +0000 Subject: [PATCH 3/3] backport of commit 2c8bc07e7d6c96324691ac1f121ed8ae400ffabf --- acceptance/framework/helpers/helpers.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/acceptance/framework/helpers/helpers.go b/acceptance/framework/helpers/helpers.go index aeaf431e33..c65ff1b29a 100644 --- a/acceptance/framework/helpers/helpers.go +++ b/acceptance/framework/helpers/helpers.go @@ -225,10 +225,9 @@ func RunCommand(t testutil.TestingTB, options *k8s.KubectlOptions, command Comma select { case res := <-resultCh: if res.err != nil { - resErr := fmt.Errorf("error: %v\nOutput: %s", res.err, res.output) - return "", resErr + logger.Logf(t, "Output: %v.", res.output) } - return res.output, nil + return res.output, res.err // Sometimes this func runs for too long handle timeout if needed. case <-time.After(320 * time.Second): GetCRDRemoveFinalizers(t, options)