Revert "Replace get_marker with get_closest_marker for new pytest com…

…pat" This reverts commit 3e19e30.
reemhamz · Jan 31, 2019 · 7887f60 · 7887f60
1 parent 3e19e30
commit 7887f60
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -46,12 +46,12 @@ def internet_explorer(selenium):
 @pytest.fixture(autouse=True)
 def filter_capabilities(request):
     marker = None
-    if request.node.get_closest_marker('skip_if_firefox') and request.getfixturevalue('firefox'):
-        marker = request.node.get_closest_marker('skip_if_firefox')
-    if request.node.get_closest_marker('skip_if_not_firefox') and not request.getfixturevalue('firefox'):
-        marker = request.node.get_closest_marker('skip_if_not_firefox')
-    if request.node.get_closest_marker('skip_if_internet_explorer') and request.getfixturevalue('internet_explorer'):
-        marker = request.node.get_closest_marker('skip_if_internet_explorer')
+    if request.node.get_marker('skip_if_firefox') and request.getfixturevalue('firefox'):
+        marker = request.node.get_marker('skip_if_firefox')
+    if request.node.get_marker('skip_if_not_firefox') and not request.getfixturevalue('firefox'):
+        marker = request.node.get_marker('skip_if_not_firefox')
+    if request.node.get_marker('skip_if_internet_explorer') and request.getfixturevalue('internet_explorer'):
+        marker = request.node.get_marker('skip_if_internet_explorer')
 
     if marker:
         reason = marker.kwargs.get('reason') or marker.name