Fix #143 - fall back to old pytest marker API for older pytest version (

#144)
box · Jan 10, 2019 · 7b5d9b8 · 7b5d9b8
1 parent bc8c504
commit 7b5d9b8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/flaky/flaky_pytest_plugin.py b/flaky/flaky_pytest_plugin.py
@@ -228,9 +228,15 @@ def pytest_runtest_setup(self, item):
         :param item:
             The test item.
         """
-        for marker in item.iter_markers(name='flaky'):
-            if not self._has_flaky_attributes(item):
-                self._make_test_flaky(item, *marker.args, **marker.kwargs)
+        if not self._has_flaky_attributes(item):
+            if hasattr(item, 'iter_markers'):
+                for marker in item.iter_markers(name='flaky'):
+                    self._make_test_flaky(item, *marker.args, **marker.kwargs)
+                    break
+            elif hasattr(item, 'get_marker'):
+                marker = item.get_marker('flaky')
+                if marker:
+                    self._make_test_flaky(item, *marker.args, **marker.kwargs)
 
     def pytest_sessionfinish(self):
         """

diff --git a/setup.py b/setup.py
@@ -55,7 +55,7 @@ def main():
     base_dir = dirname(__file__)
     setup(
         name='flaky',
-        version='3.5.1',
+        version='3.5.2',
         description='Plugin for nose or pytest that automatically reruns flaky tests.',
         long_description=open(join(base_dir, 'README.rst')).read(),
         author='Box',