From 425d4651221d09141afd1de1367cf1ec188594ca Mon Sep 17 00:00:00 2001 From: Danek Duvall Date: Fri, 29 Jul 2016 14:19:07 -0700 Subject: [PATCH] Import mock so that it works on Python 3.x Running oslotest's tests fail on Python 3.x because of the "import mock" lines in test_output.py and test_timeout.py. That works for 2.x because "mock" is an independent package, but in 3.x, it's a part of unittest in the standard library. This difference is covered in six.moves, which is where mock is imported from in other test modules. Change-Id: I3882c2a9be8abc93cf95942579cb9562c6377c01 Closes-Bug: #1607963 --- oslotest/tests/unit/test_output.py | 2 +- oslotest/tests/unit/test_timeout.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oslotest/tests/unit/test_output.py b/oslotest/tests/unit/test_output.py index 918c27f..d2605a5 100644 --- a/oslotest/tests/unit/test_output.py +++ b/oslotest/tests/unit/test_output.py @@ -16,7 +16,7 @@ import sys from oslotest import output -import mock +from six.moves import mock import testtools diff --git a/oslotest/tests/unit/test_timeout.py b/oslotest/tests/unit/test_timeout.py index dc16d93..1ba5bed 100644 --- a/oslotest/tests/unit/test_timeout.py +++ b/oslotest/tests/unit/test_timeout.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from six.moves import mock import testtools from oslotest import timeout