Merge pull request #446 from frexvahi/pytest-getfixturevalue

Avoid DeprecationWarning for getfuncargvalue in recent pytest
nameko · Jun 21, 2017 · 43e76af · 43e76af
2 parents e489212 + c2681ec
commit 43e76af
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/nameko/testing/pytest.py b/nameko/testing/pytest.py
@@ -201,7 +201,11 @@ def test_bar(rabbit_config, container_factory):
     reorder_fixtures = ('container_factory', 'runner_factory', 'rabbit_config')
     for fixture in reorder_fixtures:
         if fixture in request.funcargnames:
-            request.getfuncargvalue(fixture)
+            # getfuncargvalue is renamed to getfixturevalue in pytest 3.0
+            if hasattr(request, 'getfixturevalue'):
+                request.getfixturevalue(fixture)  # pragma: no cover
+            else:
+                request.getfuncargvalue(fixture)  # pragma: no cover
 
     consumers = []