8000 test: use pytest-ignore-flaky instead of xfail · nginx-proxy/nginx-proxy@af1c403 · GitHub
[go: up one dir, main page]
Skip to content

Commit af1c403

Browse files
buchdagbuchdag
committed
test: use pytest-ignore-flaky instead of xfail
1 parent 21c63b5 commit af1c403

File tree

4 files changed

+6
-5
lines changed
  • .github/workflows
  • < 8000 div class="PRIVATE_TreeView-item-container prc-TreeView-TreeViewItemContainer--2Rkn" style="--level:1">
    test

4 files changed

+6
-5
lines changed

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ jobs:
5050
run: make build-nginx-proxy-test-${{ matrix.base_docker_image }}
5151

5252
- name: Run tests
53-
run: pytest
53+
run: pytest --ignore-flaky
5454
working-directory: test

‎test/requirements/python-requirements.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ backoff==2.2.1
22
docker==7.1.0
33
packaging==25.0
44
pytest==8.4.1
5+
pytest-ignore-flaky==2.2.1
56
requests==2.32.4
67
urllib3==2.5.0

‎test/test_dockergen/test_dockergen_network_segregation-custom-label.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import pytest
22

33

4-
@pytest.mark.xfail(reason="flaky test")
4+
@pytest.mark.flaky
55
def test_unknown_virtual_host_is_503(docker_compose, nginxproxy):
66
r = nginxproxy.get("http://unknown.nginx-proxy.tld/")
77
assert r.status_code == 503
88

99

10-
@pytest.mark.xfail(reason="flaky test")
10+
@pytest.mark.flaky
1111
def test_forwards_to_whoami(docker_compose, nginxproxy):
1212
r = nginxproxy.get("http://whoami2.nginx-proxy.tld/")
1313
assert r.status_code == 200

‎test/test_dockergen/test_dockergen_network_segregation.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import pytest
22

33

4-
@pytest.mark.xfail(reason="flaky test")
4+
@pytest.mark.flaky
55
def test_unknown_virtual_host_is_503(docker_compose, nginxproxy):
66
r = nginxproxy.get("http://unknown.nginx-proxy.tld/")
77
assert r.status_code == 503
88

99

10-
@pytest.mark.xfail(reason="flaky test")
10+
@pytest.mark.flaky
1111
def test_forwards_to_whoami(docker_compose, nginxproxy):
1212
r = nginxproxy.get("http://whoami2.nginx-proxy.tld/")
1313
assert r.status_code == 200

0 commit comments

Comments
 (0)
0