Merge "Moving to use the mock module found in Python3"

oslotest/__init__.py

@@ -11,4 +11,7 @@
 #    under the License.
 
 import six
+
+
+six.add_move(six.MovedModule('mock', 'mock', 'unittest.mock'))
 six.add_move(six.MovedModule('mox', 'mox', 'mox3.mox'))

oslotest/base.py

@@ -20,7 +20,7 @@ import os
 import tempfile
 
 import fixtures
-import mock
+from six.moves import mock
 import testtools
 
 _TRUE_VALUES = ('True', 'true', '1', 'yes')

oslotest/mockpatch.py

@@ -16,7 +16,7 @@
 # under the License.
 
 import fixtures
-import mock
+from six.moves import mock
 
 
 class PatchObject(fixtures.Fixture):

requirements-py3.txt

@@ -4,5 +4,4 @@ python-subunit>=0.0.18
 testscenarios>=0.4
 testrepository>=0.0.18
 testtools>=0.9.34
-mock>=1.0
 mox3>=0.7.0

tests/__init__.py

@@ -0,0 +1,16 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import six
+
+
+six.add_move(six.MovedModule('mock', 'mock', 'unittest.mock'))

tests/unit/test_base.py

@@ -15,7 +15,7 @@
 import logging
 import unittest
 
-import mock
+from six.moves import mock
 import testtools
 
 from oslotest import base

tests/unit/test_mockpatch.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 
-import mock
+from six.moves import mock
 
 from oslotest import base
 from oslotest import mockpatch

tox.ini

@@ -32,4 +32,6 @@ exclude = .tox,dist,doc,*.egg,build
 builtins = _
 
 [hacking]
-import_exceptions = six.moves.mox
+import_exceptions =
+    six.moves.mock
+    six.moves.mox