From d4264dc3b2ab292c9843fb1d001c7fc0a5fc67c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 29 Mar 2019 18:36:45 +0100
Subject: [PATCH] Pytest: Use get_closest_marker

See https://github.com/pytest-dev/pytest/pull/4564
---
 tests/conftest.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 6b2f3e3291..aed2f5a5ec 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -32,15 +32,16 @@ def pytest_collection_modifyitems(config, items):
             continue
 
         # Mark network tests as flaky
-        if item.get_marker('network') is not None and "CI" in os.environ:
+        if (item.get_closest_marker('network') is not None and
+                "CI" in os.environ):
             item.add_marker(pytest.mark.flaky(reruns=3))
 
         if six.PY3:
-            if (item.get_marker('incompatible_with_test_venv') and
+            if (item.get_closest_marker('incompatible_with_test_venv') and
                     config.getoption("--use-venv")):
                 item.add_marker(pytest.mark.skip(
                     'Incompatible with test venv'))
-            if (item.get_marker('incompatible_with_venv') and
+            if (item.get_closest_marker('incompatible_with_venv') and
                     sys.prefix != sys.base_prefix):
                 item.add_marker(pytest.mark.skip(
                     'Incompatible with venv'))