From 0349f86323b164b6768727b199fd106acebc2bee Mon Sep 17 00:00:00 2001 From: cskh Date: Wed, 25 Jan 2023 14:27:16 -0500 Subject: [PATCH 1/2] flaky test: use retry long to wait for config entry upgrade --- test/integration/connect/envoy/helpers.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/connect/envoy/helpers.bash b/test/integration/connect/envoy/helpers.bash index 3612cdb5cd21..b3e26781ce71 100755 --- a/test/integration/connect/envoy/helpers.bash +++ b/test/integration/connect/envoy/helpers.bash @@ -784,7 +784,7 @@ function setup_upsert_l4_intention { local DESTINATION=$2 local ACTION=$3 - retry_default docker_curl primary -sL -XPUT "http://127.0.0.1:8500/v1/connect/intentions/exact?source=${SOURCE}&destination=${DESTINATION}" \ + retry_long docker_curl primary -sL -XPUT "http://127.0.0.1:8500/v1/connect/intentions/exact?source=${SOURCE}&destination=${DESTINATION}" \ -d"{\"Action\": \"${ACTION}\"}" >/dev/null } From 7d253030a5de466cb7d0a4f0dfa54f46e43f94a4 Mon Sep 17 00:00:00 2001 From: cskh Date: Wed, 25 Jan 2023 15:39:49 -0500 Subject: [PATCH 2/2] increase wait for rbac policy --- test/integration/connect/envoy/case-badauthz/verify.bats | 2 +- test/integration/connect/envoy/helpers.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/connect/envoy/case-badauthz/verify.bats b/test/integration/connect/envoy/case-badauthz/verify.bats index 739d89720916..d0b2258b074d 100644 --- a/test/integration/connect/envoy/case-badauthz/verify.bats +++ b/test/integration/connect/envoy/case-badauthz/verify.bats @@ -27,7 +27,7 @@ load helpers } @test "s2 should have network rbac rules loaded from xDS" { - retry_default assert_envoy_network_rbac_policy_count localhost:19001 1 + retry_long assert_envoy_network_rbac_policy_count localhost:19001 1 } @test "s1 upstream should NOT be able to connect to s2" { diff --git a/test/integration/connect/envoy/helpers.bash b/test/integration/connect/envoy/helpers.bash index b3e26781ce71..3612cdb5cd21 100755 --- a/test/integration/connect/envoy/helpers.bash +++ b/test/integration/connect/envoy/helpers.bash @@ -784,7 +784,7 @@ function setup_upsert_l4_intention { local DESTINATION=$2 local ACTION=$3 - retry_long docker_curl primary -sL -XPUT "http://127.0.0.1:8500/v1/connect/intentions/exact?source=${SOURCE}&destination=${DESTINATION}" \ + retry_default docker_curl primary -sL -XPUT "http://127.0.0.1:8500/v1/connect/intentions/exact?source=${SOURCE}&destination=${DESTINATION}" \ -d"{\"Action\": \"${ACTION}\"}" >/dev/null }