From 4e5b9eb043b6bf1a176cfaac9db7d6209b9982f6 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <kdreyer@redhat.com>
Date: Wed, 4 Dec 2019 16:18:43 +0000
Subject: [PATCH] Revert "Replace removed getfuncargvalue by getfixturevalue"

This reverts commit 189fada339b8a999de3bd6a512904d90109f55cc.

RHEL 7 ships pytest v2.7.0 for Python 2 and EPEL 7 ships pytest v2.9.2
for Python 3. getfixturevalue is only in pytest v3.0.0 or newer.
---
 testing/conftest.py        | 4 ++--
 testing/test_serializer.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testing/conftest.py b/testing/conftest.py
index ff734dc..40a9abd 100644
--- a/testing/conftest.py
+++ b/testing/conftest.py
@@ -151,7 +151,7 @@ def anypython(request):
                 executable = None
         py.test.skip("no {} found".format(name))
     if "execmodel" in request.fixturenames and name != "sys.executable":
-        backend = request.getfixturevalue("execmodel").backend
+        backend = request.getfuncargvalue("execmodel").backend
         if backend != "thread":
             pytest.xfail("cannot run {!r} execmodel with bare {}".format(backend, name))
     return executable
@@ -186,7 +186,7 @@ def gw(request, execmodel, group):
             gw.proxygw = proxygw
             assert pname in group
         elif request.param == "ssh":
-            sshhost = request.getfixturevalue("specssh").ssh
+            sshhost = request.getfuncargvalue("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))
diff --git a/testing/test_serializer.py b/testing/test_serializer.py
index 892e474..ffbe802 100644
--- a/testing/test_serializer.py
+++ b/testing/test_serializer.py
@@ -127,12 +127,12 @@ def py3(request):
 
 @pytest.fixture(params=["py2", "py3"])
 def dump(request):
-    return request.getfixturevalue(request.param).dump
+    return request.getfuncargvalue(request.param).dump
 
 
 @pytest.fixture(params=["py2", "py3"])
 def load(request):
-    return request.getfixturevalue(request.param).load
+    return request.getfuncargvalue(request.param).load
 
 
 simple_tests = [