Merge pull request #307 from davidszotten/use_create_autospec

Mock(spec=foo) -> create_autospec(foo)

nameko/testing/pytest.py

@@ -69,11 +69,11 @@ def empty_config():
 
 @pytest.fixture
 def mock_container(request, empty_config):
-    from mock import Mock
+    from mock import create_autospec
     from nameko.constants import SERIALIZER_CONFIG_KEY, DEFAULT_SERIALIZER
     from nameko.containers import ServiceContainer
 
-    container = Mock(spec=ServiceContainer)
+    container = create_autospec(ServiceContainer)
     container.config = empty_config
     container.config[SERIALIZER_CONFIG_KEY] = DEFAULT_SERIALIZER
     container.serializer = container.config[SERIALIZER_CONFIG_KEY]

setup.py

@@ -24,7 +24,7 @@
     install_requires=[
         "eventlet>=0.16.1",
         "kombu>=3.0.1",
-        "mock>=1.0.1",
+        "mock>=1.2",
         "path.py>=6.2",
         "pyyaml>=3.10",
         "requests>=1.2.0",

test/nameko_doc/test_rst_renderer.py

@@ -1,4 +1,4 @@
-from mock import Mock, patch, MagicMock, call
+from mock import Mock, patch, call, create_autospec
 import pytest
 from nameko.nameko_doc import rst_render as rst
 
@@ -140,7 +140,7 @@ def mock_write():
     with open('/dev/null') as test:
         file_type = type(test)  # can we get this from six?
     with patch('nameko.nameko_doc.rst_render.open', create=True) as m:
-        m.return_value = MagicMock(spec=file_type)
+        m.return_value = create_autospec(file_type)
         yield m, m.return_value.__enter__.return_value
 
 

test/test_events.py

@@ -2,7 +2,7 @@
 
 import eventlet
 import pytest
-from mock import Mock, patch
+from mock import Mock, create_autospec, patch
 
 from nameko.containers import WorkerContext
 from nameko.events import (
@@ -17,9 +17,10 @@
 
 @pytest.yield_fixture
 def queue_consumer():
-    replacement = Mock(spec=QueueConsumer)
-    with patch.object(QueueConsumer, 'bind', new=replacement) as mock_ext:
-        yield mock_ext.return_value
+    replacement = create_autospec(QueueConsumer)
+    with patch.object(QueueConsumer, 'bind') as mock_ext:
+        mock_ext.return_value = replacement
+        yield replacement
 
 
 def test_event_dispatcher(mock_container):

test/test_rpc.py

@@ -4,20 +4,22 @@
 import eventlet
 import pytest
 from eventlet.event import Event
-from mock import Mock, call, patch
+from mock import Mock, call, create_autospec, patch
 
 from nameko.containers import ServiceContainer
 from nameko.events import event_handler
 from nameko.exceptions import (
     IncorrectSignature, MalformedRequest, MethodNotFound, RemoteError,
-    UnknownService)
+    UnknownService,
+)
 from nameko.extensions import DependencyProvider
 from nameko.messaging import QueueConsumer
 from nameko.rpc import ReplyListener, Rpc, RpcConsumer, RpcProxy, rpc
 from nameko.standalone.rpc import ServiceRpcProxy
 from nameko.testing.services import entrypoint_hook, restrict_entrypoints
 from nameko.testing.utils import (
-    get_extension, wait_for_call, wait_for_worker_idle)
+    get_extension, wait_for_call, wait_for_worker_idle,
+)
 
 
 class ExampleError(Exception):
@@ -119,9 +121,10 @@ def get_rpc_exchange():
 
 @pytest.yield_fixture
 def queue_consumer():
-    replacement = Mock(spec=QueueConsumer)
-    with patch.object(QueueConsumer, 'bind', new=replacement) as mock_ext:
-        yield mock_ext.return_value
+    replacement = create_autospec(QueueConsumer)
+    with patch.object(QueueConsumer, 'bind') as mock_ext:
+        mock_ext.return_value = replacement
+        yield replacement
 
 
 def test_rpc_consumer(get_rpc_exchange, queue_consumer, mock_container):

test/test_timers.py

@@ -1,6 +1,6 @@
 import eventlet
 from eventlet import Timeout
-from mock import Mock
+from mock import create_autospec
 
 from nameko.containers import ServiceContainer
 from nameko.testing.utils import wait_for_call
@@ -12,7 +12,7 @@ def spawn_managed_thread(fn):
 
 
 def test_provider():
-    container = Mock(spec=ServiceContainer)
+    container = create_autospec(ServiceContainer)
     container.service_name = "service"
     container.spawn_managed_thread = spawn_managed_thread
 
@@ -33,7 +33,7 @@ def test_provider():
 
 
 def test_stop_timer_immediately():
-    container = Mock(spec=ServiceContainer)
+    container = create_autospec(ServiceContainer)
     container.service_name = "service"
     container.config = {}
 
@@ -49,7 +49,7 @@ def test_stop_timer_immediately():
 
 
 def test_kill_stops_timer():
-    container = Mock(spec=ServiceContainer)
+    container = create_autospec(ServiceContainer)
     container.service_name = "service"
     container.spawn_managed_thread = spawn_managed_thread
 

tox.ini

@@ -9,7 +9,7 @@ deps =
     py{33,34}-oldest: eventlet==0.17.4
     py27-oldest: kombu==3.0.1
     py{33,34}-oldest: kombu==3.0.12
-    oldest: mock==1.0.1
+    oldest: mock==1.2.0
     oldest: path.py==6.2
     py27-oldest: requests==1.2.0
     py{33,34}-oldest: requests==2.0.0
@@ -19,7 +19,7 @@ deps =
     # pinned library versions (for all pythons)
     pinned: eventlet==0.18.4
     pinned: kombu==3.0.24
-    pinned: mock==1.0.1
+    pinned: mock==2.0.0
     pinned: path.py==7.2
     pinned: requests==2.5.3
     pinned: six==1.9.0