From b11a1e92ccce9359bc37fe20173b21366a04ce77 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 2 Nov 2016 10:12:10 +0100 Subject: [PATCH] test requirements: Update pytest-rerunfailures to 2.1.0 --- misc/requirements/requirements-tests.txt | 2 +- tests/conftest.py | 2 +- tests/unit/utils/test_qtutils.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index d5fffe67b..6a18fe7bf 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -25,7 +25,7 @@ pytest-instafail==0.3.0 pytest-mock==1.3.0 pytest-qt==2.1.0 pytest-repeat==0.4.1 -pytest-rerunfailures==2.0.1 +pytest-rerunfailures==2.1.0 pytest-travis-fold==1.2.0 pytest-warnings==0.2.0 pytest-xvfb==0.3.0 diff --git a/tests/conftest.py b/tests/conftest.py index 71018fd1d..907656b80 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -121,7 +121,7 @@ def pytest_collection_modifyitems(config, items): if item.get_marker('xfail_norun'): item.add_marker(pytest.mark.xfail(run=False)) if item.get_marker('flaky_once'): - item.add_marker(pytest.mark.flaky(reruns=1)) + item.add_marker(pytest.mark.flaky()) if deselected: deselected_items.append(item) diff --git a/tests/unit/utils/test_qtutils.py b/tests/unit/utils/test_qtutils.py index b3d3dd2dc..8ac783505 100644 --- a/tests/unit/utils/test_qtutils.py +++ b/tests/unit/utils/test_qtutils.py @@ -771,7 +771,7 @@ class TestPyQIODevice: with pytest.raises(io.UnsupportedOperation): pyqiodev.seek(0, whence) - @pytest.mark.flaky(reruns=1) + @pytest.mark.flaky() def test_qprocess(self, py_proc): """Test PyQIODevice with a QProcess which is non-sequential.