8000 fix retries in tests (#4801) (#4806) · nginx/kubernetes-ingress@b048376 · GitHub
[go: up one dir, main page]
Skip to content

Commit b048376

Browse files
jjngxvepatel
jjngx
and
vepatel
authored
fix retries in tests (#4801) (#4806)
Co-authored-by: Venktesh Shivam Patel <ve.patel@f5.com>
1 parent 604d1db commit b048376

8 files changed

+16
-16
lines changed

‎tests/suite/test_transport_server_external_name.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def test_template_config(
120120
ts_externalname_setup.ic_pod_name,
121121
ingress_controller_prerequisites.namespace,
122122
)
123-
retry = +1
123+
retry = retry + 1
124124

125125
assert resolver_count == 2 # one for http and other for stream context
126126
assert (

‎tests/suite/test_transport_server_service_insight.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def test_ts_service_insight(
140140
while (resp.json() != {"Total": 1, "Up": 1, "Unhealthy": 0}) and retry < 5:
141141
resp = requests.get(service_insight_endpoint)
142142
wait_before_test()
143-
retry = +1
143+
retry = retry + 1
144144
assert resp.json() == {"Total": 1, "Up": 1, "Unhealthy": 0}
145145

146146

@@ -199,5 +199,5 @@ def test_ts_service_insight_https(
199199
while (resp.json() != {"Total": 1, "Up": 1, "Unhealthy": 0}) and retry < 5:
200200
resp = requests.get(service_insight_endpoint, verify=False)
201201
wait_before_test()
202-
retry = +1
202+
retry = retry + 1
203203
assert resp.json() == {"Total": 1, "Up": 1, "Unhealthy": 0}

‎tests/suite/test_virtual_server_backup_service.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def get_result_in_conf_with_retry(
4242
ic_pod_name,
4343
ic_pod_namespace,
4444
)
45-
retry = +1
45+
retry = retry + 1
4646
return result_conf
4747

4848

‎tests/suite/test_virtual_server_error_pages.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def test_redirect_strategy(self, kube_apis, crd_ingress_controller, virtual_serv
4343
print(f"redirect to uri: {resp.next.url}")
4444
except AttributeError as e:
4545
print(f"Exception occurred: {e}")
46-
retry = +1
46+
retry = retry + 1
4747
continue
4848
break
4949
assert f"http://{virtual_server_setup.vs_host}/error.html" in resp.next.url

‎tests/suite/test_virtual_server_service_insight.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def test_responses_svc_insight_http(
4141
while (resp.json() != {"Total": 3, "Up": 3, "Unhealthy": 0}) and retry < 5:
4242
resp = requests.get(req_url)
4343
wait_before_test()
44-
retry = +1
44+
retry = retry + 1
4545

4646
assert resp.status_code == 200, f"Expected 200 code for /probe/{host} but got {resp.status_code}"
4747
assert resp.json() == {"Total": 3, "Up": 3, "Unhealthy": 0}
@@ -99,7 +99,7 @@ def test_responses_svc_insight_https(
9999
while (resp.json() != {"Total": 3, "Up": 3, "Unhealthy": 0}) and retry < 5:
100100
resp = requests.get(req_url, verify=False)
101101
wait_before_test()
102-
retry = +1
102+
retry = retry + 1
103103
assert resp.status_code == 200, f"Expected 200 code for /probe/{host} but got {resp.status_code}"
104104
assert resp.json() == {"Total": 3, "Up": 3, "Unhealthy": 0}
105105

@@ -129,6 +129,6 @@ def test_responses_svc_insight_update_pods(
129129
while (resp.json() != {"Total": 6, "Up": 6, "Unhealthy": 0}) and retry < 5:
130130
resp = requests.get(req_url, verify=False)
131131
wait_before_test()
132-
retry = +1
132+
retry = retry + 1
133133
assert resp.status_code == 200, f"Expected 200 code for /probe/{host} but got {resp.status_code}"
134134
assert resp.json() == {"Total": 6, "Up": 6, "Unhealthy": 0}

‎tests/suite/test_watch_namespace.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def test_response_codes(self, ingress_controller, backend_setup, expected_respon
114114
retry = 0
115115
while resp.status_code != expected_responses[ing] and retry < 3:
116116
resp = requests.get(backend_setup.req_url, headers={"host": backend_setup.ingress_hosts[ing]})
117-
retry = +1
117+
retry = retry + 1
118118
wait_before_test()
119119
assert (
120120
resp.status_code == expected_responses[ing]

‎tests/suite/test_watch_namespace_label.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def test_response_codes(self, kube_apis, ingress_controller, backend_setup, expe
140140
retry = 0
141141
while resp.status_code != expected_responses[ing] and retry < 3:
142142
resp = requests.get(backend_setup.req_url, headers={"host": backend_setup.resource_hosts[ing]})
143-
retry = +1
143+
retry = retry + 1
144144
wait_before_test()
145145
assert (
146146
resp.status_code == expected_responses[ing]
@@ -155,7 +155,7 @@ def test_response_codes(self, kube_apis, ingress_controller, backend_setup, expe
155155
6284 ing = "foreign-ns-ingress"
156156
while resp.status_code != 200 and retry < 3:
157157
resp = requests.get(backend_setup.req_url, headers={"host": backend_setup.resource_hosts[ing]})
158-
retry = +1
158+
retry = retry + 1
159159
wait_before_test()
160160
assert (
161161
resp.status_code == 200
@@ -169,7 +169,7 @@ def test_response_codes(self, kube_apis, ingress_controller, backend_setup, expe
169169
retry = 0
170170
while resp.status_code != expected_responses[ing] and retry < 3:
171171
resp = requests.get(backend_setup.req_url, headers={"host": backend_setup.resource_hosts[ing]})
172-
retry = +1
172+
retry = retry + 1
173173
wait_before_test()
174174
assert (
175175
resp.status_code == expected_responses[ing]
@@ -197,7 +197,7 @@ def test_response_codes(self, kube_apis, crd_ingress_controller, backend_setup_v
197197
retry = 0
198198
while resp.status_code != expected_responses[vs] and retry < 3:
199199
resp = requests.get(backend_setup_vs.req_url, headers={"host": backend_setup_vs.resource_hosts[vs]})
200-
retry = +1
200+
retry = retry + 1
201201
wait_before_test()
202202
assert (
203203
resp.status_code == expected_responses[vs]
@@ -212,7 +212,7 @@ def test_response_codes(self, kube_apis, crd_ingress_controller, backend_setup_v
212212
vs = "foreign-ns-vs"
213213
while resp.status_code != 200 and retry < 3:
214214
resp = requests.get(backend_setup_vs.req_url, headers={"host": backend_setup_vs.resource_hosts[vs]})
215-
retry = +1
215+
retry = retry + 1
216216
wait_before_test()
217217
assert (
218218
resp.status_code == 200
@@ -226,7 +226,7 @@ def test_response_codes(self, kube_apis, crd_ingress_controller, backend_setup_v
226226
retry = 0
227227
while resp.status_code != expected_responses[vs] and retry < 3:
228228
resp = requests.get(backend_setup_vs.req_url, headers={"host": backend_setup_vs.resource_hosts[vs]})
229-
retry = +1
229+
retry = retry + 1
230230
wait_before_test()
231231
assert (
232232
resp.status_code == expected_responses[vs]

‎tests/suite/test_watch_secret_namespace.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def test_responses(
5757
except requests.exceptions.SSLError as e:
5858
exception = str(e)
5959
print(f"SSL certificate exception: {exception}")
60-
retry = +1
60+
retry = retry + 1
6161

6262
assert resp.status_code == 200
6363

0 commit comments

Comments
 (0)
0