Skip to content

Commit 8e28c37

Browse files
authored
add wait and retry in scaled rate-limit test (#6940)
1 parent 24685fc commit 8e28c37

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

tests/suite/test_rl_ingress.py

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def test_ingress_rate_limit(self, kube_apis, annotations_setup, ingress_controll
119119
@pytest.mark.annotations
120120
@pytest.mark.parametrize("annotations_setup", ["standard-scaled", "mergeable-scaled"], indirect=True)
121121
class TestRateLimitIngressScaled:
122-
def test_ingress_rate_limit_sscaled(
122+
def test_ingress_rate_limit_scaled(
123123
self, kube_apis, annotations_setup, ingress_controller_prerequisites, test_namespace
124124
):
125125
"""
@@ -133,14 +133,20 @@ def test_ingress_rate_limit_sscaled(
133133
wait_before_test()
134134

135135
ic_pods = get_pod_list(kube_apis.v1, ns)
136-
for i in range(len(ic_pods)):
137-
conf = get_ingress_nginx_template_conf(
138-
kube_apis.v1,
139-
annotations_setup.namespace,
140-
annotations_setup.ingress_name,
141-
ic_pods[i].metadata.name,
142-
ingress_controller_prerequisites.namespace,
143-
)
144-
flag = ("rate=10r/s" in conf) or ("rate=13r/s" in conf)
145-
assert flag
136+
flag = False
137+
retries = 0
138+
while flag is False and retries < 10:
139+
retries += 1
140+
wait_before_test()
141+
for i in range(len(ic_pods)):
142+
conf = get_ingress_nginx_template_conf(
143+
kube_apis.v1,
144+
annotations_setup.namespace,
145+
annotations_setup.ingress_name,
146+
ic_pods[i].metadata.name,
147+
ingress_controller_prerequisites.namespace,
148+
)
149+
flag = ("rate=10r/s" in conf) or ("rate=13r/s" in conf)
150+
151+
assert flag
146152
scale_deployment(kube_apis.v1, kube_apis.apps_v1_api, "nginx-ingress", ns, 1)

0 commit comments

Comments
 (0)