From e30e08a04e2254384793bcf92807fb71e168bedb Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 4 Jun 2018 19:00:13 +0200 Subject: [PATCH 1/7] Update pyroma from 2.3 to 2.3.1 --- misc/requirements/requirements-pyroma.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pyroma.txt b/misc/requirements/requirements-pyroma.txt index 241273169..6afd097f9 100644 --- a/misc/requirements/requirements-pyroma.txt +++ b/misc/requirements/requirements-pyroma.txt @@ -1,4 +1,4 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py docutils==0.14 -pyroma==2.3 +pyroma==2.3.1 From 454d026fdc7dd9e7edf44fc170ff0a6bb609a72e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 4 Jun 2018 19:00:14 +0200 Subject: [PATCH 2/7] Update more-itertools from 4.1.0 to 4.2.0 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index a2d4df525..4353c00de 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -16,7 +16,7 @@ itsdangerous==0.24 # Jinja2==2.10 Mako==1.0.7 # MarkupSafe==1.0 -more-itertools==4.1.0 +more-itertools==4.2.0 parse==1.8.2 parse-type==0.4.2 pluggy==0.6.0 From 46329b0f0387fd8ad77c64b609bbdd5705319b7f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 4 Jun 2018 19:00:16 +0200 Subject: [PATCH 3/7] Update parse from 1.8.2 to 1.8.4 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 4353c00de..de2800632 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -17,7 +17,7 @@ itsdangerous==0.24 Mako==1.0.7 # MarkupSafe==1.0 more-itertools==4.2.0 -parse==1.8.2 +parse==1.8.4 parse-type==0.4.2 pluggy==0.6.0 py==1.5.3 From 9f9a5d576b90bd688a8acb826644a0a00c985f55 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 4 Jun 2018 19:00:18 +0200 Subject: [PATCH 4/7] Update pytest from 3.5.1 to 3.6.0 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index de2800632..52b2cd79e 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -22,7 +22,7 @@ parse-type==0.4.2 pluggy==0.6.0 py==1.5.3 py-cpuinfo==4.0.0 -pytest==3.5.1 +pytest==3.6.0 pytest-bdd==2.21.0 pytest-benchmark==3.1.1 pytest-cov==2.5.1 From 62e86e14826909c0df36c9e34d0d4dd2f4107bac Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 4 Jun 2018 19:00:19 +0200 Subject: [PATCH 5/7] Update pytest-qt from 2.3.2 to 2.4.0 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 52b2cd79e..23b3dd306 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -29,7 +29,7 @@ pytest-cov==2.5.1 pytest-faulthandler==1.5.0 pytest-instafail==0.4.0 pytest-mock==1.10.0 -pytest-qt==2.3.2 +pytest-qt==2.4.0 pytest-repeat==0.4.1 pytest-rerunfailures==4.0 pytest-travis-fold==1.3.0 From dc203d46ded40f827a757f0f6ce0e0af5dc790d8 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 4 Jun 2018 19:00:21 +0200 Subject: [PATCH 6/7] Update pytest-rerunfailures from 4.0 to 4.1 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 23b3dd306..3105679c4 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -31,7 +31,7 @@ pytest-instafail==0.4.0 pytest-mock==1.10.0 pytest-qt==2.4.0 pytest-repeat==0.4.1 -pytest-rerunfailures==4.0 +pytest-rerunfailures==4.1 pytest-travis-fold==1.3.0 pytest-xvfb==1.1.0 PyVirtualDisplay==0.2.1 From 11b957f24bd41b72a70be9ee27636ccc67d01e28 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 7 Jun 2018 19:29:01 +0200 Subject: [PATCH 7/7] tests: Adjust getting markers for pytest 3.6 --- tests/conftest.py | 8 ++++---- tests/end2end/conftest.py | 2 +- tests/end2end/fixtures/quteprocess.py | 4 ++-- tests/end2end/fixtures/test_quteprocess.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 0b82bc7f6..71bc9f388 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -80,7 +80,7 @@ def _apply_platform_markers(config, item): ] for searched_marker, condition, default_reason in markers: - marker = item.get_marker(searched_marker) + marker = item.get_closest_marker(searched_marker) if not marker or not condition: continue @@ -138,9 +138,9 @@ def pytest_collection_modifyitems(config, items): item.add_marker(pytest.mark.end2end) _apply_platform_markers(config, item) - if item.get_marker('xfail_norun'): + if list(item.iter_markers('xfail_norun')): item.add_marker(pytest.mark.xfail(run=False)) - if item.get_marker('js_prompt'): + if list(item.iter_markers('js_prompt')): if config.webengine: item.add_marker(pytest.mark.skipif( PYQT_VERSION <= 0x050700, @@ -226,7 +226,7 @@ def set_backend(monkeypatch, request): @pytest.fixture(autouse=True) def apply_fake_os(monkeypatch, request): - fake_os = request.node.get_marker('fake_os') + fake_os = request.node.get_closest_marker('fake_os') if not fake_os: return diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py index 5226396a3..136d6eb67 100644 --- a/tests/end2end/conftest.py +++ b/tests/end2end/conftest.py @@ -151,7 +151,7 @@ def pytest_collection_modifyitems(config, items): for item in items: for name, prefix, pytest_mark, condition in markers: - marker = item.get_marker(name) + marker = item.get_closest_marker(name) if marker and condition: if marker.args: text = '{}: {}'.format(prefix, marker.args[0]) diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py index 0c560cf51..7311c7b38 100644 --- a/tests/end2end/fixtures/quteprocess.py +++ b/tests/end2end/fixtures/quteprocess.py @@ -394,7 +394,7 @@ class QuteProc(testprocess.Process): elif (is_ignored_qt_message(self.request.config, line) or is_ignored_lowlevel_message(line) or is_ignored_chromium_message(line) or - self.request.node.get_marker('no_invalid_lines')): + list(self.request.node.iter_markers('no_invalid_lines'))): self._log("IGNORED: {}".format(line)) return None else: @@ -501,7 +501,7 @@ class QuteProc(testprocess.Process): """Extend wait_for to add divisor if a test is xfailing.""" __tracebackhide__ = (lambda e: e.errisinstance(testprocess.WaitForTimeout)) - xfail = self.request.node.get_marker('xfail') + xfail = self.request.node.get_closest_marker('xfail') if xfail and (not xfail.args or xfail.args[0]): kwargs['divisor'] = 10 else: diff --git a/tests/end2end/fixtures/test_quteprocess.py b/tests/end2end/fixtures/test_quteprocess.py index 9aab0aa0f..a0dcaf5ce 100644 --- a/tests/end2end/fixtures/test_quteprocess.py +++ b/tests/end2end/fixtures/test_quteprocess.py @@ -68,7 +68,7 @@ class FakeNode: def __init__(self, call): self.rep_call = call - def get_marker(self, _name): + def get_closest_marker(self, _name): return None