Py3: use unittest.mock instead of mock (#3481)

* Py3: use unittest.mock instead of mock

* noqa

* oops

* just pull in patch()

* ignore RuntimeError when stopping patch

* ignore RuntimeError from default_session_mock.stop()

tests/test_cloudformation/test_stack_parsing.py

@@ -2,8 +2,8 @@ from __future__ import unicode_literals
 import json
 import yaml
 
-from mock import patch
 import sure  # noqa
+from tests.compat import patch
 
 from moto.cloudformation.exceptions import ValidationError
 from moto.cloudformation.models import FakeStack

tests/test_core/test_server.py

@@ -1,7 +1,8 @@
 from __future__ import unicode_literals
-from mock import patch
+
 import sure  # noqa
 
+from tests.compat import patch
 from moto.server import main, create_backend_app, DomainDispatcherApplication
 
 

tests/test_dynamodbstreams/test_dynamodbstreams.py

@@ -36,7 +36,10 @@ class TestCore:
         self.stream_arn = None
 
         for m in self.mocks:
-            m.stop()
+            try:
+                m.stop()
+            except RuntimeError:
+                pass
 
     def test_verify_stream(self):
         conn = boto3.client("dynamodb", region_name="us-east-1")
@@ -200,7 +203,10 @@ class TestEdges:
 
     def teardown(self):
         for m in self.mocks:
-            m.stop()
+            try:
+                m.stop()
+            except RuntimeError:
+                pass
 
     def test_enable_stream_on_table(self):
         conn = boto3.client("dynamodb", region_name="us-east-1")

tests/test_packages/test_httpretty.py

@@ -1,7 +1,6 @@
 # #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-import mock
 
 from moto.packages.httpretty.core import (
     HTTPrettyRequest,

tests/test_rds2/test_filters.py

@@ -28,7 +28,10 @@ class TestDBInstanceFilters(object):
 
     @classmethod
     def teardown_class(cls):
-        cls.mock_rds.stop()
+        try:
+            cls.mock_rds.stop()
+        except RuntimeError:
+            pass
 
     def test_invalid_filter_name_raises_error(self):
         with pytest.raises(ClientError) as ex:
@@ -203,7 +206,10 @@ class TestDBSnapshotFilters(object):
 
     @classmethod
     def teardown_class(cls):
-        cls.mock_rds.stop()
+        try:
+            cls.mock_rds.stop()
+        except RuntimeError:
+            pass
 
     def test_invalid_filter_name_raises_error(self):
         with pytest.raises(ClientError) as ex: