diff --git a/tests/drivers/test_impl_rabbit.py b/tests/drivers/test_impl_rabbit.py index 515e49bec..b2da4a828 100644 --- a/tests/drivers/test_impl_rabbit.py +++ b/tests/drivers/test_impl_rabbit.py @@ -23,14 +23,14 @@ import kombu from oslotest import mockpatch import testscenarios -from oslo.config import cfg from oslo import messaging -from oslo.serialization import jsonutils +from oslo_config import cfg from oslo_messaging._drivers import amqp from oslo_messaging._drivers import amqpdriver from oslo_messaging._drivers import common as driver_common from oslo_messaging._drivers import impl_rabbit as rabbit_driver from oslo_messaging.tests import utils as test_utils +from oslo_serialization import jsonutils from six.moves import mock load_tests = testscenarios.load_tests_apply_scenarios diff --git a/tests/drivers/test_impl_zmq.py b/tests/drivers/test_impl_zmq.py index ddc6753ea..ff8f75f7a 100644 --- a/tests/drivers/test_impl_zmq.py +++ b/tests/drivers/test_impl_zmq.py @@ -27,8 +27,8 @@ except ImportError: zmq = None from oslo import messaging -from oslo.utils import importutils from oslo_messaging.tests import utils as test_utils +from oslo_utils import importutils # eventlet is not yet py3 compatible, so skip if not installed eventlet = importutils.try_import('eventlet') diff --git a/tests/drivers/test_matchmaker.py b/tests/drivers/test_matchmaker.py index 767414509..fe59fef15 100644 --- a/tests/drivers/test_matchmaker.py +++ b/tests/drivers/test_matchmaker.py @@ -14,8 +14,8 @@ import testtools -from oslo.utils import importutils from oslo_messaging.tests import utils as test_utils +from oslo_utils import importutils # NOTE(jamespage) matchmaker tied directly to eventlet # which is not yet py3 compatible - skip if import fails diff --git a/tests/drivers/test_matchmaker_redis.py b/tests/drivers/test_matchmaker_redis.py index a36e14af6..35a8c1464 100644 --- a/tests/drivers/test_matchmaker_redis.py +++ b/tests/drivers/test_matchmaker_redis.py @@ -14,8 +14,8 @@ import testtools -from oslo.utils import importutils from oslo_messaging.tests import utils as test_utils +from oslo_utils import importutils redis = importutils.try_import('redis') matchmaker_redis = ( diff --git a/tests/drivers/test_matchmaker_ring.py b/tests/drivers/test_matchmaker_ring.py index c3bc52493..010746472 100644 --- a/tests/drivers/test_matchmaker_ring.py +++ b/tests/drivers/test_matchmaker_ring.py @@ -14,8 +14,8 @@ import testtools -from oslo.utils import importutils from oslo_messaging.tests import utils as test_utils +from oslo_utils import importutils # NOTE(jamespage) matchmaker tied directly to eventlet # which is not yet py3 compatible - skip if import fails diff --git a/tests/notify/test_listener.py b/tests/notify/test_listener.py index 80c26a62b..84e257d16 100644 --- a/tests/notify/test_listener.py +++ b/tests/notify/test_listener.py @@ -18,9 +18,9 @@ import time import testscenarios -from oslo.config import cfg from oslo import messaging from oslo.messaging.notify import dispatcher +from oslo_config import cfg from oslo_messaging.tests import utils as test_utils from six.moves import mock diff --git a/tests/rpc/test_client.py b/tests/rpc/test_client.py index 5f138925e..65c4f6752 100644 --- a/tests/rpc/test_client.py +++ b/tests/rpc/test_client.py @@ -15,10 +15,10 @@ import testscenarios -from oslo.config import cfg from oslo import messaging from oslo.messaging import exceptions from oslo.messaging import serializer as msg_serializer +from oslo_config import cfg from oslo_messaging.tests import utils as test_utils load_tests = testscenarios.load_tests_apply_scenarios diff --git a/tests/rpc/test_server.py b/tests/rpc/test_server.py index b429191e2..6e1ae1603 100644 --- a/tests/rpc/test_server.py +++ b/tests/rpc/test_server.py @@ -17,8 +17,8 @@ import threading import testscenarios -from oslo.config import cfg from oslo import messaging +from oslo_config import cfg from oslo_messaging.tests import utils as test_utils from six.moves import mock diff --git a/tests/test_exception_serialization.py b/tests/test_exception_serialization.py index 74d808f05..17e8ff1f1 100644 --- a/tests/test_exception_serialization.py +++ b/tests/test_exception_serialization.py @@ -19,9 +19,9 @@ import six import testscenarios from oslo import messaging -from oslo.serialization import jsonutils from oslo_messaging._drivers import common as exceptions from oslo_messaging.tests import utils as test_utils +from oslo_serialization import jsonutils load_tests = testscenarios.load_tests_apply_scenarios diff --git a/tests/test_transport.py b/tests/test_transport.py index 36f8db8ea..a3b5b9128 100644 --- a/tests/test_transport.py +++ b/tests/test_transport.py @@ -19,9 +19,9 @@ import six from stevedore import driver import testscenarios -from oslo.config import cfg from oslo import messaging from oslo.messaging import transport +from oslo_config import cfg from oslo_messaging.tests import utils as test_utils from oslo_messaging import transport as private_transport