[stable-2.6] Fix unit test issues with pytest >= 4.0.0.

(cherry picked from commit feb5b0b299)

Co-authored-by: Matt Clay <matt@mystile.com>

test/units/module_utils/basic/test_argument_spec.py

@@ -130,9 +130,9 @@ def options_argspec_list():
 
 
 @pytest.fixture
-def options_argspec_dict():
+def options_argspec_dict(options_argspec_list):
     # should test ok, for options in dict format.
-    kwargs = options_argspec_list()
+    kwargs = options_argspec_list
     kwargs['argument_spec']['foobar']['type'] = 'dict'
 
     return kwargs

test/units/modules/packaging/os/conftest.py

@@ -10,7 +10,7 @@ def get_method_name(request_body):
 
 @pytest.fixture
 def mock_request(request, mocker):
-    responses = request.getfuncargvalue('testcase')['calls']
+    responses = request.getfixturevalue('testcase')['calls']
     module_name = request.module.TESTED_MODULE
 
     def transport_request(host, handler, request_body, verbose=0):