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/tests/unit/test_timeout.py | |
| parent | ffdf6f10be50bf8c2debd23e076077668b2e9fb6 (diff) | |
| download | oslotest-ussuri-em.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/tests/unit/test_timeout.py')
| -rw-r--r-- | oslotest/tests/unit/test_timeout.py | 3 |
1 files changed, 1 insertions, 2 deletions
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 |