p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in cgilling/pytest (pull request #123) 

Fix to work properly when @patch is used with new not equal to DEFAULT
This commit is contained in:
holger krekel 2014-03-26 19:05:46 +01:00
parent 9dc43e84dc e3b9382122
commit 530cae9204
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_pytest/python.py
View File

@ -1841,7 +1841,13 @@ def getfuncargnames(function, startindex=None):
if startindex is None: if startindex is None:
startindex = inspect.ismethod(function) and 1 or 0 startindex = inspect.ismethod(function) and 1 or 0
if realfunction != function: if realfunction != function:
startindex += len(getattr(function, "patchings", [])) mock = sys.modules.get('mock')
if mock is not None:
for patching in getattr(function, "patchings", []):
if not patching.attribute_name and patching.new is mock.DEFAULT:
startindex += 1
else:
startindex += len(getattr(function, "patchings", []))
function = realfunction function = realfunction
argnames = inspect.getargs(py.code.getrawcode(function))[0] argnames = inspect.getargs(py.code.getrawcode(function))[0]
defaults = getattr(function, 'func_defaults', defaults = getattr(function, 'func_defaults',

3
testing/python/integration.py
View File

@ -124,8 +124,11 @@ class TestMockDecoration:
def test_hello(self, abspath): def test_hello(self, abspath):
os.path.abspath("hello") os.path.abspath("hello")
abspath.assert_any_call("hello") abspath.assert_any_call("hello")
def mock_basename(path):
return "mock_basename"
@mock.patch("os.path.abspath") @mock.patch("os.path.abspath")
@mock.patch("os.path.normpath") @mock.patch("os.path.normpath")
@mock.patch("os.path.basename",new=mock_basename)
def test_someting(normpath, abspath, tmpdir): def test_someting(normpath, abspath, tmpdir):
abspath.return_value = "this" abspath.return_value = "this"
os.path.normpath(os.path.abspath("hello")) os.path.normpath(os.path.abspath("hello"))