diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-04-05 09:46:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-04-05 09:46:04 +0000 |
| commit | c5cc2b7b7e90edfa41d35ccf1dac13e0f7ac2da0 (patch) | |
| tree | 773ad6276b59942bc484caa88a8d2746365906ad /tests/test_multithreading.py | |
| parent | 1eaf4c549fd30d831aca11e05eeddbfb77ac3388 (diff) | |
| parent | 4e7bc75432d366eb32190d8a9e9582be564fbace (diff) | |
| download | python-swiftclient-c5cc2b7b7e90edfa41d35ccf1dac13e0f7ac2da0.tar.gz | |
Merge "Use the standard library's copy of mock when it's available."
Diffstat (limited to 'tests/test_multithreading.py')
| -rw-r--r-- | tests/test_multithreading.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/test_multithreading.py b/tests/test_multithreading.py index b566837..81b0766 100644 --- a/tests/test_multithreading.py +++ b/tests/test_multithreading.py @@ -15,7 +15,12 @@ import sys import time -import mock + +try: + from unittest import mock +except ImportError: + import mock + import testtools import threading import six |