|
9 | 9 |
|
10 | 10 | script_dir = os.path.dirname(__file__) |
11 | 11 |
|
12 | | -pytestmark = pytest.mark.xfail() # TODO delete this marker once those issues are fixed |
13 | | - |
14 | 12 | @pytest.fixture(scope="module", autouse=True) |
15 | 13 | def certs(): |
16 | 14 | """ |
@@ -45,28 +43,24 @@ def test_https_web_is_200(docker_compose, nginxproxy): |
45 | 43 | assert "answer from port 81\n" in r.text |
46 | 44 |
|
47 | 45 |
|
48 | | -@pytest.mark.incremental |
49 | 46 | def test_delete_cert_and_restart_reverseproxy(docker_compose): |
50 | 47 | os.remove(join(script_dir, "tmp_certs", "web.nginx-proxy.crt")) |
51 | 48 | docker_compose.containers.get("reverseproxy").restart() |
52 | 49 | sleep(3) # give time for the container to initialize |
53 | 50 | assert "running" == docker_compose.containers.get("reverseproxy").status |
54 | 51 |
|
55 | 52 |
|
56 | | -@pytest.mark.incremental |
57 | | -def test_unknown_virtual_host_is_still_503(nginxproxy): |
| 53 | +def test_unknown_virtual_host_is_still_503(docker_compose, nginxproxy): |
58 | 54 | r = nginxproxy.get("http://foo.nginx-proxy/") |
59 | 55 | assert r.status_code == 503 |
60 | 56 |
|
61 | 57 |
|
62 | | -@pytest.mark.incremental |
63 | | -def test_http_web_is_now_200(nginxproxy): |
| 58 | +def test_http_web_is_now_200(docker_compose, nginxproxy): |
64 | 59 | r = nginxproxy.get("http://web.nginx-proxy/port", allow_redirects=False) |
65 | 60 | assert r.status_code == 200 |
66 | 61 | assert "answer from port 81\n" == r.text |
67 | 62 |
|
68 | 63 |
|
69 | | -@pytest.mark.incremental |
70 | 64 | def test_https_web_is_now_broken_since_there_is_no_cert(nginxproxy): |
71 | 65 | with pytest.raises(ConnectionError): |
72 | 66 | nginxproxy.get("https://web.nginx-proxy/port") |
0 commit comments