Require pytest 3.6 and cleanup of get_markers code (#211)

Fix #210

Author: nicoddemus

docs/news.rst

@@ -1,6 +1,11 @@
 Release Notes
 =============
 
+1.16.0 (unreleased)
+-------------------
+
+* ``pytest-selenium`` now requires pytest 3.6 or later.
+
 1.15.1 (2019-01-07)
 -------------------
 

pytest_selenium/drivers/cloud.py

@@ -38,18 +38,3 @@ def get_credential(self, key, envs):
 
     def uses_driver(self, driver):
         return driver.lower() == self.name.lower()
-
-
-def get_markers(node):
-    # `MarkInfo` is removed in pytest 4.1.0
-    # see https://github.com/pytest-dev/pytest/pull/4564
-    try:
-        from _pytest.mark import MarkInfo
-
-        keywords = node.keywords
-        markers = [m for m in keywords.keys() if isinstance(keywords[m], MarkInfo)]
-    except ImportError:
-        # `iter_markers` was introduced in pytest 3.6
-        markers = [m.name for m in node.iter_markers()]
-
-    return markers

pytest_selenium/drivers/firefox.py

@@ -98,32 +98,17 @@ def firefox_options(request, firefox_path, firefox_profile):
 
 
 def get_arguments_from_markers(node):
-    # get_marker is deprecated since pytest 3.6
-    # https://docs.pytest.org/en/latest/mark.html#marker-revamp-and-iteration
-    try:
-        arguments = []
-        [arguments.extend(m.args) for m in node.iter_markers("firefox_arguments")]
-        return arguments
-    except AttributeError:
-        arguments = node.get_marker("firefox_arguments")
-        # backwards-compat
-        # can be removed when minimum req pytest is 3.6
-        return arguments.args if arguments else []
+    arguments = []
+    for m in node.iter_markers("firefox_arguments"):
+        arguments.extend(m.args)
+    return arguments
 
 
 def get_preferences_from_markers(node):
-    # get_marker is deprecated since pytest 3.6
-    # https://docs.pytest.org/en/latest/mark.html#marker-revamp-and-iteration
-    try:
-        preferences = dict()
-        for mark in node.iter_markers("firefox_preferences"):
-            preferences.update(mark.args[0])
-        return preferences
-    except AttributeError:
-        # backwards-compat
-        # can be removed when minimum req pytest is 3.6
-        preferences = node.get_marker("firefox_preferences")
-        return preferences.args[0] if preferences else {}
+    preferences = dict()
+    for mark in node.iter_markers("firefox_preferences"):
+        preferences.update(mark.args[0])
+    return preferences
 
 
 @pytest.fixture(scope="session")

pytest_selenium/drivers/saucelabs.py

@@ -9,7 +9,7 @@
 import pytest
 import requests
 
-from pytest_selenium.drivers.cloud import Provider, get_markers
+from pytest_selenium.drivers.cloud import Provider
 
 
 class SauceLabs(Provider):
@@ -92,7 +92,8 @@ def driver_kwargs(request, test, capabilities, **kwargs):
     _capabilities.setdefault("username", provider.username)
     _capabilities.setdefault("accessKey", provider.key)
     _capabilities.setdefault("name", test)
-    tags = _capabilities.get("tags", []) + get_markers(request.node)
+    markers = [x.name for x in request.node.iter_markers()]
+    tags = _capabilities.get("tags", []) + markers
     if tags:
         _capabilities["tags"] = tags
 

pytest_selenium/drivers/testingbot.py

@@ -7,7 +7,7 @@
 from py.xml import html
 import requests
 
-from pytest_selenium.drivers.cloud import Provider, get_markers
+from pytest_selenium.drivers.cloud import Provider
 
 HOST = "hub.testingbot.com"
 PORT = 443
@@ -90,7 +90,8 @@ def driver_kwargs(request, test, capabilities, host, port, **kwargs):
     capabilities.setdefault("name", test)
     capabilities.setdefault("client_key", provider.key)
     capabilities.setdefault("client_secret", provider.secret)
-    groups = capabilities.get("groups", []) + get_markers(request.node)
+    markers = [x.name for x in request.node.iter_markers()]
+    groups = capabilities.get("groups", []) + markers
     if groups:
         capabilities["groups"] = groups
     kwargs = {

pytest_selenium/pytest_selenium.py

@@ -105,23 +105,15 @@ def capabilities(
 
 
 def get_capabilities_from_markers(node):
-    # get_marker is deprecated since pytest 3.6
-    # https://docs.pytest.org/en/latest/mark.html#marker-revamp-and-iteration
-    try:
-        capabilities = dict()
-        for level, mark in node.iter_markers_with_node("capabilities"):
-            LOGGER.debug(
-                "{0} marker <{1.name}> "
-                "contained kwargs <{1.kwargs}>".format(level.__class__.__name__, mark)
-            )
-            capabilities.update(mark.kwargs)
-        LOGGER.info("Capabilities from markers: {}".format(capabilities))
-        return capabilities
-    except AttributeError:
-        # backwards-compat
-        # can be removed when minimum req pytest is 3.6
-        capabilities = node.get_marker("capabilities")
-        return capabilities.kwargs if capabilities else {}
+    capabilities = dict()
+    for level, mark in node.iter_markers_with_node("capabilities"):
+        LOGGER.debug(
+            "{0} marker <{1.name}> "
+            "contained kwargs <{1.kwargs}>".format(level.__class__.__name__, mark)
+        )
+        capabilities.update(mark.kwargs)
+    LOGGER.info("Capabilities from markers: {}".format(capabilities))
+    return capabilities
 
 
 @pytest.fixture

setup.py

@@ -10,7 +10,7 @@
     url="https://github.com/pytest-dev/pytest-selenium",
     packages=["pytest_selenium", "pytest_selenium.drivers"],
     install_requires=[
-        "pytest>=3.0",
+        "pytest>=3.6",
         "pytest-base-url",
         "pytest-html>=1.14.0",
         "pytest-variables>=1.5.0",