Replace removed getfuncargvalue by getfixturevalue

Author: nicoddemus

testing/conftest.py

@@ -133,7 +133,7 @@ def anypython(request):
                 executable = None
         py.test.skip("no {} found".format(name))
     if "execmodel" in request.fixturenames and name != 'sys.executable':
-        backend = request.getfuncargvalue("execmodel").backend
+        backend = request.getfixturevalue("execmodel").backend
         if backend != "thread":
             pytest.xfail(
                 "cannot run {!r} execmodel with bare {}".format(backend, name))
@@ -169,7 +169,7 @@ def gw(request, execmodel, group):
             gw.proxygw = proxygw
             assert pname in group
         elif request.param == "ssh":
-            sshhost = request.getfuncargvalue('specssh').ssh
+            sshhost = request.getfixturevalue('specssh').ssh
             # we don't use execmodel.backend here
             # but you can set it when specifying the ssh spec
             gw = group.makegateway("ssh={}//id=ssh".format(sshhost))

testing/test_serializer.py

@@ -116,12 +116,12 @@ def py3(request):
 
 @pytest.fixture(params=['py2', 'py3'])
 def dump(request):
-    return request.getfuncargvalue(request.param).dump
+    return request.getfixturevalue(request.param).dump
 
 
 @pytest.fixture(params=['py2', 'py3'])
 def load(request):
-    return request.getfuncargvalue(request.param).load
+    return request.getfixturevalue(request.param).load
 
 
 simple_tests = [