Merged in cgilling/pytest (pull request #123)

Fix to work properly when @patch is used with new not equal to DEFAULT
2014-03-26 19:05:46 +01:00
parent 9dc43e84dc e3b9382122
commit 530cae9204
2 changed files with 10 additions and 1 deletions
--- a/testing/python/integration.py
+++ b/testing/python/integration.py
@@ -124,8 +124,11 @@ class TestMockDecoration:
                def test_hello(self, abspath):
                    os.path.abspath("hello")
                    abspath.assert_any_call("hello")
+            def mock_basename(path):
+                return "mock_basename"
            @mock.patch("os.path.abspath")
            @mock.patch("os.path.normpath")
+            @mock.patch("os.path.basename",new=mock_basename)
            def test_someting(normpath, abspath, tmpdir):
                abspath.return_value = "this"
                os.path.normpath(os.path.abspath("hello"))