wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
(cherry picked from commit feb5b0b299)

Co-authored-by: Matt Clay <matt@mystile.com>
This commit is contained in:
Matt Clay 2018-11-14 17:41:15 -08:00
parent e33da22346
commit 6937268444
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/units/module_utils/basic/test_argument_spec.py
View file

@ -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

2
test/units/modules/packaging/os/conftest.py
View file

@ -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):