8000 Merge pull request #2356 from nginx-proxy/revert-2355 · nginx-proxy/nginx-proxy@18e7885 · GitHub
[go: up one dir, main page]

Skip to content

Commit 18e7885

Browse files
authored
Merge pull request #2356 from nginx-proxy/revert-2355
test: revert "Fix test" and "Sleep longer"
2 parents db27a07 + a4ced5b commit 18e7885

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

test/stress_tests/test_deleted_cert/test_restart_while_missing_cert.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
script_dir = os.path.dirname(__file__)
1111

12+
pytestmark = pytest.mark.xfail() # TODO delete this marker once those issues are fixed
13+
1214
@pytest.fixture(scope="module", autouse=True)
1315
def certs():
1416
"""
@@ -43,24 +45,28 @@ def test_https_web_is_200(docker_compose, nginxproxy):
4345
assert "answer from port 81\n" in r.text
4446

4547

48+
@pytest.mark.incremental
4649
def test_delete_cert_and_restart_reverseproxy(docker_compose):
4750
os.remove(join(script_dir, "tmp_certs", "web.nginx-proxy.crt"))
4851
docker_compose.containers.get("reverseproxy").restart()
49-
sleep(5) # give time for the container to initialize
52+
sleep(3) # give time for the container to initialize
5053
assert "running" == docker_compose.containers.get("reverseproxy").status
5154

5255

53-
def test_unknown_virtual_host_is_still_503(docker_compose, nginxproxy):
56+
@pytest.mark.incremental
57+
def test_unknown_virtual_host_is_still_503(nginxproxy):
5458
r = nginxproxy.get("http://foo.nginx-proxy/")
5559
assert r.status_code == 503
5660

5761

58-
def test_http_web_is_now_200(docker_compose, nginxproxy):
62+
@pytest.mark.incremental
63+
def test_http_web_is_now_200(nginxproxy):
5964
r = nginxproxy.get("http://web.nginx-proxy/port", allow_redirects=False)
6065
assert r.status_code == 200
6166
assert "answer from port 81\n" == r.text
6267

6368

69+
@pytest.mark.incremental
6470
def test_https_web_is_now_broken_since_there_is_no_cert(nginxproxy):
6571
with pytest.raises(ConnectionError):
6672
nginxproxy.get("https://web.nginx-proxy/port")

0 commit comments

Comments
 (0)
0