Improve tests by checking returned "spy" object

Check that the same interface applies when using the
returned "spy" object from mocker.spy as it applies for
using the mocked object directly

Author: nicoddemus

pytest_mock.py

@@ -52,18 +52,18 @@ def spy(self, obj, method_name):
             can_autospec = True
 
         if can_autospec:
-            kwargs = dict(autospec=True)
+            kwargs = dict(
+                autospec=True,
+            )
         else:
             # Can't use autospec because of https://bugs.python.org/issue23078
             kwargs = dict(
                 new_callable=mock_module.MagicMock,
                 spec=True,
             )
 
-        def func(*args, **kwargs):
-            return method(*args, **kwargs)
-
-        return self.patch.object(obj, method_name, side_effect=func, **kwargs)
+        result = self.patch.object(obj, method_name, side_effect=method, **kwargs)
+        return result
 
     def stub(self):
         """
@@ -97,7 +97,6 @@ def object(self, *args, **kwargs):
             """API to mock.patch.object"""
             return self._start_patch(mock_module.patch.object, *args, **kwargs)
 
-
         def multiple(self, *args, **kwargs):
             """API to mock.patch.multiple"""
             return self._start_patch(mock_module.patch.multiple, *args,
@@ -107,7 +106,6 @@ def dict(self, *args, **kwargs):
             """API to mock.patch.dict"""
             return self._start_patch(mock_module.patch.dict, *args, **kwargs)
 
-
         def __call__(self, *args, **kwargs):
             """API to mock.patch"""
             return self._start_patch(mock_module.patch, *args, **kwargs)

test_pytest_mock.py

@@ -155,21 +155,29 @@ def bar(self, arg):
             return arg * 2
 
     foo = Foo()
-    mocker.spy(foo, 'bar')
+    other = Foo()
+    spy = mocker.spy(foo, 'bar')
     assert foo.bar(arg=10) == 20
+    assert other.bar(arg=10) == 20
     foo.bar.assert_called_once_with(arg=10)
+    spy.assert_called_once_with(arg=10)
 
 
 def test_instance_method_by_class_spy(mocker):
+    from pytest_mock import mock_module
+
     class Foo(object):
 
         def bar(self, arg):
             return arg * 2
 
-    mocker.spy(Foo, 'bar')
+    spy = mocker.spy(Foo, 'bar')
     foo = Foo()
+    other = Foo()
     assert foo.bar(arg=10) == 20
-    foo.bar.assert_called_once_with(foo, arg=10)
+    assert other.bar(arg=10) == 20
+    calls = [mock_module.call(foo, arg=10), mock_module.call(other, arg=10)]
+    assert spy.call_args_list == calls
 
 
 def test_class_method_spy(mocker):
@@ -179,9 +187,10 @@ class Foo(object):
         def bar(cls, arg):
             return arg * 2
 
-    mocker.spy(Foo, 'bar')
+    spy = mocker.spy(Foo, 'bar')
     assert Foo.bar(arg=10) == 20
     Foo.bar.assert_called_once_with(arg=10)
+    spy.assert_called_once_with(arg=10)
 
 
 def test_class_method_with_metaclass_spy(mocker):
@@ -196,10 +205,10 @@ class Foo(object):
         def bar(cls, arg):
             return arg * 2
 
-    mocker.spy(Foo, 'bar')
+    spy = mocker.spy(Foo, 'bar')
     assert Foo.bar(arg=10) == 20
     Foo.bar.assert_called_once_with(arg=10)
-    return Foo, False
+    spy.assert_called_once_with(arg=10)
 
 
 def test_static_method_spy(mocker):
@@ -209,6 +218,7 @@ class Foo(object):
         def bar(arg):
             return arg * 2
 
-    mocker.spy(Foo, 'bar')
+    spy = mocker.spy(Foo, 'bar')
     assert Foo.bar(arg=10) == 20
     Foo.bar.assert_called_once_with(arg=10)
+    spy.assert_called_once_with(arg=10)