From 9b869d8622dc9f40dc04a0b740af99df367c37f2 Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Thu, 21 Mar 2024 15:47:45 -0400 Subject: [PATCH] Backport of improve reliability of acceptance tests into release/1.2.x (#3805) * backport of commit 6e6f4c946ac4e0658bd8443bec99283ede4a958b * backport of commit b3e66a8a0473b3321c6271a26c94871debb00967 * backport of commit 2c8bc07e7d6c96324691ac1f121ed8ae400ffabf --------- Co-authored-by: NiniOak --- acceptance/framework/helpers/helpers.go | 3 +++ acceptance/tests/api-gateway/api_gateway_test.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/acceptance/framework/helpers/helpers.go b/acceptance/framework/helpers/helpers.go index f3d81f936c..c65ff1b29a 100644 --- a/acceptance/framework/helpers/helpers.go +++ b/acceptance/framework/helpers/helpers.go @@ -224,6 +224,9 @@ func RunCommand(t testutil.TestingTB, options *k8s.KubectlOptions, command Comma select { case res := <-resultCh: + if res.err != nil { + logger.Logf(t, "Output: %v.", res.output) + } return res.output, res.err // Sometimes this func runs for too long handle timeout if needed. case <-time.After(320 * time.Second): 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")