diff options
| author | Ben Nemec <bnemec@redhat.com> | 2020-04-03 14:22:14 +0000 |
|---|---|---|
| committer | Ben Nemec <bnemec@redhat.com> | 2020-04-03 14:24:35 +0000 |
| commit | cdee551ae6145e4646809bf65e71817a63328d9a (patch) | |
| tree | 5787e83c5717a0573ea2495374bd431aaec67774 /oslotest/base.py | |
| parent | ffdf6f10be50bf8c2debd23e076077668b2e9fb6 (diff) | |
| download | oslotest-cdee551ae6145e4646809bf65e71817a63328d9a.tar.gz | |
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
Diffstat (limited to 'oslotest/base.py')
| -rw-r--r-- | oslotest/base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oslotest/base.py b/oslotest/base.py index acb7a33..fb4b02d 100644 --- a/oslotest/base.py +++ b/oslotest/base.py @@ -16,7 +16,6 @@ """Common utilities used in testing""" import logging -from unittest import mock import fixtures from oslotest import createfile @@ -24,6 +23,7 @@ from oslotest import log from oslotest import output from oslotest import timeout +from six.moves import mock import testtools LOG = logging.getLogger(__name__) |