Switch to unittest.mock from mock4.1.0

In python3 mock is in the unittest package and doesn't need to
install mock directly.

Change-Id: I195ac9739936372042b5d7d3c0c3f3bd82b04107

5 files changed, 8 insertions, 7 deletions

diff --git a/oslotest/tests/unit/test_base.py b/oslotest/tests/unit/test_base.py
index b98c672..86e76d4 100644
--- a/oslotest/tests/unit/test_base.py
+++ b/oslotest/tests/unit/test_base.py
@@ -17,10 +17,10 @@
 import logging
 import os
 import unittest
+from unittest import mock
 
 import fixtures
 import six
-from six.moves import mock
 import testtools
 
 from oslotest import base
diff --git a/oslotest/tests/unit/test_log.py b/oslotest/tests/unit/test_log.py
index 55c02a0..f5fdc49 100644
--- a/oslotest/tests/unit/test_log.py
+++ b/oslotest/tests/unit/test_log.py
@@ -15,8 +15,8 @@
 #    under the License.
 
 import logging
+from unittest import mock
 
-from six.moves import mock
 import testtools
 
 from oslotest import log
diff --git a/oslotest/tests/unit/test_mock_fixture.py b/oslotest/tests/unit/test_mock_fixture.py
index e578fb4..896bbcb 100644
--- a/oslotest/tests/unit/test_mock_fixture.py
+++ b/oslotest/tests/unit/test_mock_fixture.py
@@ -13,8 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from oslotest import mock_fixture
 
diff --git a/oslotest/tests/unit/test_output.py b/oslotest/tests/unit/test_output.py
index b4abcf0..1f67ba8 100644
--- a/oslotest/tests/unit/test_output.py
+++ b/oslotest/tests/unit/test_output.py
@@ -13,12 +13,12 @@
 #    under the License.
 
 import sys
+from unittest import mock
 
-from oslotest import output
-
-from six.moves import mock
 import testtools
 
+from oslotest import output
+
 
 class CaptureOutputTest(testtools.TestCase):
 
diff --git a/oslotest/tests/unit/test_timeout.py b/oslotest/tests/unit/test_timeout.py
index 38c7a3d..9c0b32c 100644
--- a/oslotest/tests/unit/test_timeout.py
+++ b/oslotest/tests/unit/test_timeout.py
@@ -12,7 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from six.moves import mock
+from unittest import mock
+
 import testtools
 
 from oslotest import timeout