diff options
| author | Zuul <zuul@review.opendev.org> | 2020-06-08 09:06:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-06-08 09:06:23 +0000 |
| commit | bc223f9b1d11f0b1a4f10213f85911b7cdcbbe02 (patch) | |
| tree | c23877b6a31e612e0a78784c079b633027ce99fe /oslotest/tests/unit/test_timeout.py | |
| parent | 5a0d3c2fa53061953a783edf2aac1def983fa8e0 (diff) | |
| parent | 21beb1537f6f2ab5babf1d1572ca216836b90248 (diff) | |
| download | oslotest-bc223f9b1d11f0b1a4f10213f85911b7cdcbbe02.tar.gz | |
Merge "Revert "Revert "Switch to unittest.mock from mock"""4.4.0
Diffstat (limited to 'oslotest/tests/unit/test_timeout.py')
| -rw-r--r-- | oslotest/tests/unit/test_timeout.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/oslotest/tests/unit/test_timeout.py b/oslotest/tests/unit/test_timeout.py index 38c7a3d..9c0b32c 100644 --- a/oslotest/tests/unit/test_timeout.py +++ b/oslotest/tests/unit/test_timeout.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from six.moves import mock +from unittest import mock + import testtools from oslotest import timeout |