Revert "Switch to unittest.mock from mock"ussuri-em4.2.0

This reverts commit ffdf6f10be50bf8c2debd23e076077668b2e9fb6.

Switching oslotest to unittest.mock has broken a bunch of other
projects because they were (incorrectly) relying on oslotest to
pull in third-party mock for them. Until we get everyone migrated,
let's hold off on doing this for oslotest.

Change-Id: I0bdca39686f3653a56f9e4a554662727e2dbaafd

5 files changed, 7 insertions, 8 deletions

diff --git a/oslotest/tests/unit/test_base.py b/oslotest/tests/unit/test_base.py
index 86e76d4..b98c672 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 f5fdc49..55c02a0 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 896bbcb..e578fb4 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 1f67ba8..b4abcf0 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
-
-import testtools
 
 from oslotest import output
 
+from six.moves import mock
+import testtools
+
 
 class CaptureOutputTest(testtools.TestCase):
 
diff --git a/oslotest/tests/unit/test_timeout.py b/oslotest/tests/unit/test_timeout.py
index 9c0b32c..38c7a3d 100644
--- a/oslotest/tests/unit/test_timeout.py
+++ b/oslotest/tests/unit/test_timeout.py
@@ -12,8 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from unittest import mock
-
+from six.moves import mock
 import testtools
 
 from oslotest import timeout