diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-13 18:24:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-13 18:24:20 +0000 |
| commit | cf76a002512e45e9c5cfd5d805f29b031c55dc69 (patch) | |
| tree | 40ff4713965873125898d926b296b4372fb64788 /openstackclient/tests/unit/object | |
| parent | 90ca67bdae937244bcb0f3ee9bd89e89dcf128d9 (diff) | |
| parent | 69db9fe73c81bc6341c37948365163902b6437ee (diff) | |
| download | python-openstackclient-cf76a002512e45e9c5cfd5d805f29b031c55dc69.tar.gz | |
Merge "Raise flake8-import-order version to latest"
Diffstat (limited to 'openstackclient/tests/unit/object')
4 files changed, 4 insertions, 7 deletions
diff --git a/openstackclient/tests/unit/object/v1/fakes.py b/openstackclient/tests/unit/object/v1/fakes.py index 5d65d106..0ed791a5 100644 --- a/openstackclient/tests/unit/object/v1/fakes.py +++ b/openstackclient/tests/unit/object/v1/fakes.py @@ -13,9 +13,8 @@ # under the License. # -import six - from keystoneauth1 import session +import six from openstackclient.api import object_store_v1 as object_store from openstackclient.tests.unit import utils diff --git a/openstackclient/tests/unit/object/v1/test_container.py b/openstackclient/tests/unit/object/v1/test_container.py index 39e2d80f..7d3cc8d8 100644 --- a/openstackclient/tests/unit/object/v1/test_container.py +++ b/openstackclient/tests/unit/object/v1/test_container.py @@ -14,8 +14,7 @@ # import copy - -import mock +from unittest import mock from openstackclient.api import object_store_v1 as object_store from openstackclient.object.v1 import container diff --git a/openstackclient/tests/unit/object/v1/test_object.py b/openstackclient/tests/unit/object/v1/test_object.py index b6299373..fc3073c8 100644 --- a/openstackclient/tests/unit/object/v1/test_object.py +++ b/openstackclient/tests/unit/object/v1/test_object.py @@ -14,8 +14,7 @@ # import copy - -import mock +from unittest import mock from openstackclient.api import object_store_v1 as object_store from openstackclient.object.v1 import object as obj diff --git a/openstackclient/tests/unit/object/v1/test_object_all.py b/openstackclient/tests/unit/object/v1/test_object_all.py index 08a7534d..dd587142 100644 --- a/openstackclient/tests/unit/object/v1/test_object_all.py +++ b/openstackclient/tests/unit/object/v1/test_object_all.py @@ -12,8 +12,8 @@ # import copy +from unittest import mock -import mock from osc_lib import exceptions from requests_mock.contrib import fixture import six |