8000 test: request method for specific http code · nginx-proxy/nginx-proxy@7deba81 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7deba81

Browse files
buchdagbuchdag
committed
test: request method for specific http code
1 parent 29f9abc commit 7deba81

24 files changed

+62
-42
lines changed

‎test/conftest.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,14 @@ def get_unknown_host(self, *args, **kwargs) -> Response:
120120
*args,
121121
**kwargs
122122
)
123+
124+
def get_with_code(self, code: int | List[int], *args, **kwargs) -> Response:
125+
return self._with_backoff(
126+
'get',
127+
lambda r: r.status_code in code,
128+
*args,
129+
**kwargs
130+
)
123131

124132
def get(self, *args, **kwargs) -> Response:
125133
return self._with_backoff('get', lambda r: r.status_code in (404, 502), *args, **kwargs)

‎test/test_acme-http-challenge-location/test_acme-http-challenge-location-accept-unknown-host.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ def test_redirect_acme_challenge_location_enabled(docker_compose, nginxproxy, ac
66
assert r.status_code == 200
77

88
def test_redirect_acme_challenge_location_disabled(docker_compose, nginxproxy, acme_challenge_path):
9-
r = nginxproxy.get(
9+
r = nginxproxy.get_with_code(
10+
301,
1011
f"http://web2.nginx-proxy.tld/{acme_challenge_path}",
1112
allow_redirects=False
1213
)
13-
assert r.status_code == 301
14+
assert r.is_permanent_redirect
1415

1516
def test_noredirect_acme_challenge_location_enabled(docker_compose, nginxproxy, acme_challenge_path):
1617
r = nginxproxy.get(
@@ -20,7 +21,8 @@ def test_noredirect_acme_challenge_location_enabled(docker_compose, nginxproxy,
2021
assert r.status_code == 200
2122

2223
def test_noredirect_acme_challenge_location_disabled(docker_compose, nginxproxy, acme_challenge_path):
23-
r = nginxproxy.get(
24+
r = nginxproxy.get_with_code(
25+
404,
2426
f"http://web4.nginx-proxy.tld/{acme_challenge_path}",
2527
allow_redirects=False
2628
)

‎test/test_acme-http-challenge-location/test_acme-http-challenge-location-disabled.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
def test_redirect_acme_challenge_location_disabled(docker_compose, nginxproxy, acme_challenge_path):
2-
r = nginxproxy.get(
2+
r = nginxproxy.get_with_code(
3+
301,
34
f"http://web1.nginx-proxy.tld/{acme_challenge_path}",
45
allow_redirects=False
56
)
6-
assert r.status_code == 301
7+
assert r.is_permanent_redirect
78

89
def test_redirect_acme_challenge_location_enabled(docker_compose, nginxproxy, acme_challenge_path):
910
r = nginxproxy.get(
@@ -13,7 +14,8 @@ def test_redirect_acme_challenge_location_enabled(docker_compose, nginxproxy, ac
1314
assert r.status_code == 200
1415

1516
def test_noredirect_acme_challenge_location_disabled(docker_compose, nginxproxy, acme_challenge_path):
16-
r = nginxproxy.get(
17+
r = nginxproxy.get_with_code(
18+
404,
1719
f"http://web3.nginx-proxy.tld/{acme_challenge_path}",
1820
allow_redirects=False
1921
)

‎test/test_acme-http-challenge-location/test_acme-http-challenge-location-enabled-is-default.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ def test_redirect_acme_challenge_location_enabled(docker_compose, nginxproxy, ac
66
assert r.status_code == 200
77

88
def test_redirect_acme_challenge_location_disabled(docker_compose, nginxproxy, acme_challenge_path):
9-
r = nginxproxy.get(
9+
r = nginxproxy.get_with_code(
10+
301,
1011
f"http://web2.nginx-proxy.tld/{acme_challenge_path}",
1112
allow_redirects=False
1213
)
13-
assert r.status_code == 301
14+
assert r.is_permanent_redirect
1415

1516
def test_noredirect_acme_challenge_location_enabled(docker_compose, nginxproxy, acme_challenge_path):
1617
r = nginxproxy.get(
@@ -21,6 +22,7 @@ def test_noredirect_acme_challenge_location_enabled(docker_compose, nginxproxy,
2122

2223
def test_noredirect_acme_challenge_location_disabled(docker_compose, nginxproxy, acme_challenge_path):
2324
r = nginxproxy.get(
25+
404,
2426
f"http://web4.nginx-proxy.tld/{acme_challenge_path}",
2527
allow_redirects=False
2628
)

‎test/test_acme-http-challenge-location/test_acme-http-challenge-location-legacy.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ def test_redirect_acme_challenge_location_legacy(docker_compose, nginxproxy, acm
66
assert r.status_code == 200
77

88
def test_noredirect_acme_challenge_location_legacy(docker_compose, nginxproxy, acme_challenge_path):
9-
r = nginxproxy.get(
9+
r = nginxproxy.get_with_code(
10+
404,
1011
f"http://web2.nginx-proxy.tld/{acme_challenge_path}",
1112
allow_redirects=False
1213
)

‎test/test_custom-error-page/test_custom-error-page.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33

44
def test_custom_error_page(docker_compose, nginxproxy):
5-
r = nginxproxy.get("http://unknown.nginx-proxy.tld")
5+
r = nginxproxy.get_with_code(503, "http://unknown.nginx-proxy.tld")
66
assert r.status_code == 503
77
assert re.search(r"Damn, there's some maintenance in progress.", r.text)

‎test/test_debug-endpoint/test_global.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ def test_debug_endpoint_hostname_replaced_by_warning_if_regexp(docker_compose, n
4444

4545

4646
def test_debug_endpoint_is_disabled_per_container(docker_compose, nginxproxy):
47-
r = nginxproxy.get("http://disabled.debug.nginx-proxy.example/nginx-proxy-debug")
47+
r = nginxproxy.get_with_code(404, "http://disabled.debug.nginx-proxy.example/nginx-proxy-debug")
4848
assert r.status_code == 404

‎test/test_debug-endpoint/test_per-container.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55

66
def test_debug_endpoint_is_disabled_globally(docker_compose, nginxproxy):
7-
r = nginxproxy.get("http://disabled1.debug.nginx-proxy.example/nginx-proxy-debug")
7+
r = nginxproxy.get_with_code(404,"http://disabled1.debug.nginx-proxy.example/nginx-proxy-debug")
88
assert r.status_code == 404
9-
r = nginxproxy.get("http://disabled2.debug.nginx-proxy.example/nginx-proxy-debug")
9+
r = nginxproxy.get_with_code(404,"http://disabled2.debug.nginx-proxy.example/nginx-proxy-debug")
1010
assert r.status_code == 404
1111

1212

‎test/test_enable-http-on-missing-cert/test_enable-http-on-missing-cert.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ def test_nohttp_missing_cert_enabled(docker_compose, nginxproxy):
77
assert r.status_code == 200
88

99
def test_redirect_missing_cert_disabled(docker_compose, nginxproxy):
10-
r = nginxproxy.get("http://redirect-missing-cert-disabled.nginx-proxy.tld/", allow_redirects=False)
11-
assert r.status_code == 301
10+
r = nginxproxy.get_with_code(
11+
301,
12+
"http://redirect-missing-cert-disabled.nginx-proxy.tld/",
13+
allow_redirects=False)
14+
assert r.is_permanent_redirect
1215

1316
def test_redirect_missing_cert_enabled(docker_compose, nginxproxy):
1417
r = nginxproxy.get("http://redirect-missing-cert-enabled.nginx-proxy.tld/", allow_redirects=False)

‎test/test_events/test_events.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def test_new_container_is_detected_vpath(web2, nginxproxy):
7474
r = nginxproxy.get("http://nginx-proxy/web2/port")
7575
assert r.status_code == 200
7676
assert "answer from port 82\n" == r.text
77-
r = nginxproxy.get("http://nginx-proxy/port")
77+
r = nginxproxy.get_with_code([404, 503],"http://nginx-proxy/port")
7878
assert r.status_code in [404, 503]
7979

8080
web2.remove(force=True)

0 commit comments

Comments
 (0)
0