diff options
Diffstat (limited to 'heat/tests/clients')
21 files changed, 30 insertions, 22 deletions
diff --git a/heat/tests/clients/test_barbican_client.py b/heat/tests/clients/test_barbican_client.py index 977886710..6159ab70e 100644 --- a/heat/tests/clients/test_barbican_client.py +++ b/heat/tests/clients/test_barbican_client.py @@ -12,9 +12,9 @@ # under the License. import collections +from unittest import mock from barbicanclient import exceptions -import mock from heat.common import exception from heat.engine.clients.os import barbican diff --git a/heat/tests/clients/test_blazar_client.py b/heat/tests/clients/test_blazar_client.py index f9410f9fe..e671f862c 100644 --- a/heat/tests/clients/test_blazar_client.py +++ b/heat/tests/clients/test_blazar_client.py @@ -11,9 +11,10 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from heat.tests import common from heat.tests import utils -import mock class BlazarClientPluginTest(common.HeatTestCase): diff --git a/heat/tests/clients/test_cinder_client.py b/heat/tests/clients/test_cinder_client.py index bebfc574d..69b13c612 100644 --- a/heat/tests/clients/test_cinder_client.py +++ b/heat/tests/clients/test_cinder_client.py @@ -12,11 +12,11 @@ # under the License. """Tests for :module:'heat.engine.clients.os.cinder'.""" +from unittest import mock import uuid from cinderclient import exceptions as cinder_exc from keystoneauth1 import exceptions as ks_exceptions -import mock from heat.common import exception from heat.engine.clients.os import cinder diff --git a/heat/tests/clients/test_clients.py b/heat/tests/clients/test_clients.py index d30a4f4fb..c392c2a30 100644 --- a/heat/tests/clients/test_clients.py +++ b/heat/tests/clients/test_clients.py @@ -11,6 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from aodhclient import exceptions as aodh_exc from cinderclient import exceptions as cinder_exc from glanceclient import exc as glance_exc @@ -20,7 +22,6 @@ from keystoneauth1 import exceptions as keystone_exc from keystoneauth1.identity import generic from manilaclient import exceptions as manila_exc from mistralclient.api import base as mistral_base -import mock from neutronclient.common import exceptions as neutron_exc from openstack import exceptions from oslo_config import cfg diff --git a/heat/tests/clients/test_designate_client.py b/heat/tests/clients/test_designate_client.py index 03f74547f..5631565aa 100644 --- a/heat/tests/clients/test_designate_client.py +++ b/heat/tests/clients/test_designate_client.py @@ -11,8 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from designateclient import client as designate_client -import mock from heat.common import exception as heat_exception from heat.engine.clients.os import designate as client diff --git a/heat/tests/clients/test_glance_client.py b/heat/tests/clients/test_glance_client.py index 738f471d8..4db8b1ead 100644 --- a/heat/tests/clients/test_glance_client.py +++ b/heat/tests/clients/test_glance_client.py @@ -11,10 +11,10 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock import uuid from glanceclient import exc -import mock from heat.engine.clients import client_exception as exception from heat.engine.clients.os import glance diff --git a/heat/tests/clients/test_heat_client.py b/heat/tests/clients/test_heat_client.py index c7d4d5cb8..912fbdf75 100644 --- a/heat/tests/clients/test_heat_client.py +++ b/heat/tests/clients/test_heat_client.py @@ -12,7 +12,7 @@ # under the License. import json -import mock +from unittest import mock import uuid from keystoneauth1 import access as ks_access diff --git a/heat/tests/clients/test_ironic_client.py b/heat/tests/clients/test_ironic_client.py index a56ae3e1b..5b0568d57 100644 --- a/heat/tests/clients/test_ironic_client.py +++ b/heat/tests/clients/test_ironic_client.py @@ -11,8 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from ironicclient import exceptions as ic_exc -import mock from heat.engine.clients.os import ironic as ic from heat.tests import common diff --git a/heat/tests/clients/test_keystone_client.py b/heat/tests/clients/test_keystone_client.py index 8536604fa..ddf041d58 100644 --- a/heat/tests/clients/test_keystone_client.py +++ b/heat/tests/clients/test_keystone_client.py @@ -11,8 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from keystoneauth1 import exceptions as keystone_exceptions -import mock from heat.common import exception from heat.engine.clients.os import keystone diff --git a/heat/tests/clients/test_magnum_client.py b/heat/tests/clients/test_magnum_client.py index 97bf939ce..e0468308c 100644 --- a/heat/tests/clients/test_magnum_client.py +++ b/heat/tests/clients/test_magnum_client.py @@ -11,8 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from magnumclient import exceptions as mc_exc -import mock from heat.engine.clients.os import magnum as mc from heat.tests import common diff --git a/heat/tests/clients/test_manila_client.py b/heat/tests/clients/test_manila_client.py index a1a986091..5ed2f7a2f 100644 --- a/heat/tests/clients/test_manila_client.py +++ b/heat/tests/clients/test_manila_client.py @@ -11,9 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. import collections +from unittest import mock from manilaclient import exceptions -import mock from heat.common import exception as heat_exception from heat.tests import common diff --git a/heat/tests/clients/test_mistral_client.py b/heat/tests/clients/test_mistral_client.py index da3707ba1..b05475423 100644 --- a/heat/tests/clients/test_mistral_client.py +++ b/heat/tests/clients/test_mistral_client.py @@ -11,8 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from mistralclient.auth import keystone -import mock from heat.common import exception from heat.engine.clients.os import mistral diff --git a/heat/tests/clients/test_monasca_client.py b/heat/tests/clients/test_monasca_client.py index 37214c693..b5d566d6f 100644 --- a/heat/tests/clients/test_monasca_client.py +++ b/heat/tests/clients/test_monasca_client.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception as heat_exception from heat.engine.clients.os import monasca as client_plugin diff --git a/heat/tests/clients/test_neutron_client.py b/heat/tests/clients/test_neutron_client.py index a8b8b9e62..bc470b79b 100644 --- a/heat/tests/clients/test_neutron_client.py +++ b/heat/tests/clients/test_neutron_client.py @@ -11,7 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from neutronclient.common import exceptions as qe from heat.common import exception diff --git a/heat/tests/clients/test_nova_client.py b/heat/tests/clients/test_nova_client.py index 9bdba9a2a..35e37cc61 100644 --- a/heat/tests/clients/test_nova_client.py +++ b/heat/tests/clients/test_nova_client.py @@ -13,9 +13,9 @@ """Tests for :module:'heat.engine.clients.os.nova'.""" import collections +from unittest import mock import uuid -import mock from novaclient import client as nc from novaclient import exceptions as nova_exceptions from oslo_config import cfg diff --git a/heat/tests/clients/test_sahara_client.py b/heat/tests/clients/test_sahara_client.py index 1cc97dd44..d0d0d3438 100644 --- a/heat/tests/clients/test_sahara_client.py +++ b/heat/tests/clients/test_sahara_client.py @@ -11,9 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock import uuid -import mock from saharaclient.api import base as sahara_base from heat.common import exception diff --git a/heat/tests/clients/test_sdk_client.py b/heat/tests/clients/test_sdk_client.py index 98f40af07..d2fd238f0 100644 --- a/heat/tests/clients/test_sdk_client.py +++ b/heat/tests/clients/test_sdk_client.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from openstack import exceptions diff --git a/heat/tests/clients/test_senlin_client.py b/heat/tests/clients/test_senlin_client.py index 9510050d1..0e3bdf3d8 100644 --- a/heat/tests/clients/test_senlin_client.py +++ b/heat/tests/clients/test_senlin_client.py @@ -11,7 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from openstack import exceptions from heat.engine.clients.os import senlin as senlin_plugin diff --git a/heat/tests/clients/test_swift_client.py b/heat/tests/clients/test_swift_client.py index 4b6d1060f..90272b6df 100644 --- a/heat/tests/clients/test_swift_client.py +++ b/heat/tests/clients/test_swift_client.py @@ -12,8 +12,8 @@ # under the License. import datetime +from unittest import mock -import mock import pytz from testtools import matchers diff --git a/heat/tests/clients/test_zaqar_client.py b/heat/tests/clients/test_zaqar_client.py index ffd7b6aaa..bd588c7c9 100644 --- a/heat/tests/clients/test_zaqar_client.py +++ b/heat/tests/clients/test_zaqar_client.py @@ -11,10 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine.clients.os import zaqar - from heat.tests import common from heat.tests import utils diff --git a/heat/tests/clients/test_zun_client.py b/heat/tests/clients/test_zun_client.py index ae022a223..e20326597 100644 --- a/heat/tests/clients/test_zun_client.py +++ b/heat/tests/clients/test_zun_client.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.tests import common from heat.tests import utils |