diff --git a/sdk/servicebus/azure-servicebus/tests/async_tests/test_queues_async.py b/sdk/servicebus/azure-servicebus/tests/async_tests/test_queues_async.py index cfedf2ecbeca..16e1c88588ba 100644 --- a/sdk/servicebus/azure-servicebus/tests/async_tests/test_queues_async.py +++ b/sdk/servicebus/azure-servicebus/tests/async_tests/test_queues_async.py @@ -61,15 +61,15 @@ OperationTimeoutError ) from devtools_testutils import AzureMgmtRecordedTestCase, AzureRecordedTestCase -from servicebus_preparer import ( +from tests.servicebus_preparer import ( CachedServiceBusNamespacePreparer, CachedServiceBusQueuePreparer, ServiceBusQueuePreparer, CachedServiceBusResourceGroupPreparer ) -from utilities import get_logger, print_message, sleep_until_expired +from tests.utilities import get_logger, print_message, sleep_until_expired from mocks_async import MockReceivedMessage, MockReceiver -from utilities import get_logger, print_message, sleep_until_expired, uamqp_transport as get_uamqp_transport, ArgPasserAsync +from tests.utilities import get_logger, print_message, sleep_until_expired, uamqp_transport as get_uamqp_transport, ArgPasserAsync uamqp_transport_params, uamqp_transport_ids = get_uamqp_transport() diff --git a/sdk/servicebus/azure-servicebus/tests/async_tests/test_sb_client_async.py b/sdk/servicebus/azure-servicebus/tests/async_tests/test_sb_client_async.py index 97bbe4d7832b..a9beb09f1909 100644 --- a/sdk/servicebus/azure-servicebus/tests/async_tests/test_sb_client_async.py +++ b/sdk/servicebus/azure-servicebus/tests/async_tests/test_sb_client_async.py @@ -26,7 +26,7 @@ ServiceBusConnectionError ) from devtools_testutils import AzureMgmtRecordedTestCase -from servicebus_preparer import ( +from tests.servicebus_preparer import ( CachedServiceBusNamespacePreparer, ServiceBusTopicPreparer, ServiceBusQueuePreparer, @@ -38,7 +38,7 @@ CachedServiceBusResourceGroupPreparer, SERVICEBUS_ENDPOINT_SUFFIX ) -from utilities import get_logger, uamqp_transport as get_uamqp_transport, ArgPasserAsync +from tests.utilities import get_logger, uamqp_transport as get_uamqp_transport, ArgPasserAsync uamqp_transport_params, uamqp_transport_ids = get_uamqp_transport() diff --git a/sdk/servicebus/azure-servicebus/tests/async_tests/test_sessions_async.py b/sdk/servicebus/azure-servicebus/tests/async_tests/test_sessions_async.py index c26ea49b082c..129ec409c5f8 100644 --- a/sdk/servicebus/azure-servicebus/tests/async_tests/test_sessions_async.py +++ b/sdk/servicebus/azure-servicebus/tests/async_tests/test_sessions_async.py @@ -34,7 +34,7 @@ AutoLockRenewTimeout ) from devtools_testutils import AzureMgmtRecordedTestCase -from servicebus_preparer import ( +from tests.servicebus_preparer import ( CachedServiceBusNamespacePreparer, CachedServiceBusQueuePreparer, ServiceBusTopicPreparer, @@ -42,7 +42,7 @@ ServiceBusSubscriptionPreparer, CachedServiceBusResourceGroupPreparer ) -from utilities import get_logger, print_message, uamqp_transport as get_uamqp_transport, ArgPasserAsync +from tests.utilities import get_logger, print_message, uamqp_transport as get_uamqp_transport, ArgPasserAsync uamqp_transport_params, uamqp_transport_ids = get_uamqp_transport() diff --git a/sdk/servicebus/azure-servicebus/tests/async_tests/test_subscriptions_async.py b/sdk/servicebus/azure-servicebus/tests/async_tests/test_subscriptions_async.py index b7b8b39d4b5c..0f6246c45bae 100644 --- a/sdk/servicebus/azure-servicebus/tests/async_tests/test_subscriptions_async.py +++ b/sdk/servicebus/azure-servicebus/tests/async_tests/test_subscriptions_async.py @@ -19,7 +19,7 @@ from azure.servicebus._common.constants import ServiceBusSubQueue from devtools_testutils import AzureMgmtRecordedTestCase, RandomNameResourceGroupPreparer -from servicebus_preparer import ( +from tests.servicebus_preparer import ( CachedServiceBusNamespacePreparer, CachedServiceBusTopicPreparer, CachedServiceBusSubscriptionPreparer, @@ -28,7 +28,7 @@ CachedServiceBusResourceGroupPreparer, SERVICEBUS_ENDPOINT_SUFFIX ) -from utilities import get_logger, print_message, uamqp_transport as get_uamqp_transport, ArgPasserAsync +from tests.utilities import get_logger, print_message, uamqp_transport as get_uamqp_transport, ArgPasserAsync uamqp_transport_params, uamqp_transport_ids = get_uamqp_transport() diff --git a/sdk/servicebus/azure-servicebus/tests/async_tests/test_topic_async.py b/sdk/servicebus/azure-servicebus/tests/async_tests/test_topic_async.py index 6e0aab8b3154..ae29a3f0ee8e 100644 --- a/sdk/servicebus/azure-servicebus/tests/async_tests/test_topic_async.py +++ b/sdk/servicebus/azure-servicebus/tests/async_tests/test_topic_async.py @@ -17,7 +17,7 @@ from azure.servicebus.aio import ServiceBusClient from azure.servicebus.aio._base_handler_async import ServiceBusSharedKeyCredential from azure.servicebus._common.message import ServiceBusMessage -from servicebus_preparer import ( +from tests.servicebus_preparer import ( ServiceBusNamespacePreparer, ServiceBusTopicPreparer, CachedServiceBusNamespacePreparer, @@ -25,7 +25,7 @@ CachedServiceBusResourceGroupPreparer, SERVICEBUS_ENDPOINT_SUFFIX ) -from utilities import get_logger, print_message, uamqp_transport as get_uamqp_transport, ArgPasserAsync +from tests.utilities import get_logger, print_message, uamqp_transport as get_uamqp_transport, ArgPasserAsync uamqp_transport_params, uamqp_transport_ids = get_uamqp_transport() diff --git a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_namespaces_async.py b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_namespaces_async.py index 1a26753b8cf9..8482954b8280 100644 --- a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_namespaces_async.py +++ b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_namespaces_async.py @@ -9,7 +9,7 @@ from devtools_testutils import AzureMgmtRecordedTestCase from devtools_testutils.aio import recorded_by_proxy_async -from sb_env_loader import ServiceBusPreparer +from tests.sb_env_loader import ServiceBusPreparer class TestServiceBusManagementClientNamespaceAsync(AzureMgmtRecordedTestCase): diff --git a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_queues_async.py b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_queues_async.py index 4056d65ee6c2..f7f4d84e99e0 100644 --- a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_queues_async.py +++ b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_queues_async.py @@ -15,10 +15,10 @@ from devtools_testutils import AzureMgmtRecordedTestCase from devtools_testutils.aio import recorded_by_proxy_async -from sb_env_loader import ( +from tests.sb_env_loader import ( ServiceBusPreparer ) -from servicebus_preparer import ( +from tests.servicebus_preparer import ( SERVICEBUS_ENDPOINT_SUFFIX ) diff --git a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_rules_async.py b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_rules_async.py index 43d33823452d..03646b33edf0 100644 --- a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_rules_async.py +++ b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_rules_async.py @@ -11,12 +11,12 @@ from azure.servicebus.aio.management import ServiceBusAdministrationClient from azure.servicebus.management import RuleProperties, CorrelationRuleFilter, SqlRuleFilter, TrueRuleFilter, SqlRuleAction from azure.servicebus.management._constants import INT32_MAX_VALUE -from utilities import get_logger +from tests.utilities import get_logger from azure.core.exceptions import HttpResponseError, ResourceExistsError from devtools_testutils import AzureMgmtRecordedTestCase, CachedResourceGroupPreparer, set_bodiless_matcher from devtools_testutils.aio import recorded_by_proxy_async -from sb_env_loader import ( +from tests.sb_env_loader import ( ServiceBusPreparer ) diff --git a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_subscriptions_async.py b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_subscriptions_async.py index d7f7b65e413e..9d753ab1bdde 100644 --- a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_subscriptions_async.py +++ b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_subscriptions_async.py @@ -9,15 +9,15 @@ from azure.servicebus.aio.management import ServiceBusAdministrationClient from azure.servicebus.management import SubscriptionProperties -from utilities import get_logger +from tests.utilities import get_logger from azure.core.exceptions import HttpResponseError, ResourceExistsError from devtools_testutils import AzureMgmtRecordedTestCase, CachedResourceGroupPreparer from devtools_testutils.aio import recorded_by_proxy_async -from sb_env_loader import ( +from tests.sb_env_loader import ( ServiceBusPreparer ) -from servicebus_preparer import ( +from tests.servicebus_preparer import ( SERVICEBUS_ENDPOINT_SUFFIX ) diff --git a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_topics_async.py b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_topics_async.py index 35ea48daafee..49a3a7b8c08a 100644 --- a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_topics_async.py +++ b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/async/test_mgmt_topics_async.py @@ -11,12 +11,12 @@ from azure.servicebus.management import TopicProperties from azure.servicebus.aio._base_handler_async import ServiceBusSharedKeyCredential from azure.servicebus.management import ApiVersion -from utilities import get_logger +from tests.utilities import get_logger from azure.core.exceptions import HttpResponseError, ResourceExistsError from devtools_testutils import AzureMgmtRecordedTestCase, CachedResourceGroupPreparer from devtools_testutils.aio import recorded_by_proxy_async -from sb_env_loader import ( +from tests.sb_env_loader import ( ServiceBusPreparer ) diff --git a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_namespaces.py b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_namespaces.py index eebf09e72415..6849a3afb7c4 100644 --- a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_namespaces.py +++ b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_namespaces.py @@ -8,7 +8,7 @@ from azure.servicebus.management import ServiceBusAdministrationClient from devtools_testutils import AzureMgmtRecordedTestCase, CachedResourceGroupPreparer, recorded_by_proxy -from sb_env_loader import ServiceBusPreparer +from tests.sb_env_loader import ServiceBusPreparer class TestServiceBusManagementClientNamespace(AzureMgmtRecordedTestCase): diff --git a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_queues.py b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_queues.py index a07309e5357a..9d16783f5bf1 100644 --- a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_queues.py +++ b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_queues.py @@ -12,15 +12,15 @@ from azure.servicebus.management import ServiceBusAdministrationClient, QueueProperties, ApiVersion from azure.servicebus._common.utils import utc_now -from utilities import get_logger +from tests.utilities import get_logger from azure.core.exceptions import HttpResponseError, ResourceNotFoundError, ResourceExistsError from azure.servicebus._base_handler import ServiceBusSharedKeyCredential from devtools_testutils import AzureMgmtRecordedTestCase, CachedResourceGroupPreparer, recorded_by_proxy -from sb_env_loader import ( +from tests.sb_env_loader import ( ServiceBusPreparer, ) -from servicebus_preparer import ( +from tests.servicebus_preparer import ( SERVICEBUS_ENDPOINT_SUFFIX ) diff --git a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_rules.py b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_rules.py index 16c0b9b15d3e..101a7b1c5645 100644 --- a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_rules.py +++ b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_rules.py @@ -9,11 +9,11 @@ from azure.servicebus.management import ServiceBusAdministrationClient, RuleProperties, CorrelationRuleFilter, SqlRuleFilter, TrueRuleFilter, FalseRuleFilter, SqlRuleAction from azure.servicebus.management._constants import INT32_MAX_VALUE -from utilities import get_logger +from tests.utilities import get_logger from azure.core.exceptions import HttpResponseError, ResourceExistsError from devtools_testutils import AzureMgmtRecordedTestCase, CachedResourceGroupPreparer, recorded_by_proxy, set_bodiless_matcher -from sb_env_loader import ( +from tests.sb_env_loader import ( ServiceBusPreparer ) diff --git a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_subscriptions.py b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_subscriptions.py index f13fa336f2a5..12d50ec02ece 100644 --- a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_subscriptions.py +++ b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_subscriptions.py @@ -8,14 +8,14 @@ import datetime from azure.servicebus.management import ServiceBusAdministrationClient, SubscriptionProperties -from utilities import get_logger +from tests.utilities import get_logger from azure.core.exceptions import HttpResponseError, ResourceExistsError from devtools_testutils import AzureMgmtRecordedTestCase, CachedResourceGroupPreparer, recorded_by_proxy -from sb_env_loader import ( +from tests.sb_env_loader import ( ServiceBusPreparer ) -from servicebus_preparer import ( +from tests.servicebus_preparer import ( SERVICEBUS_ENDPOINT_SUFFIX ) diff --git a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_topics.py b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_topics.py index e99e2169c105..d11c03da22e3 100644 --- a/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_topics.py +++ b/sdk/servicebus/azure-servicebus/tests/mgmt_tests/test_mgmt_topics.py @@ -9,11 +9,11 @@ from azure.servicebus.management import ServiceBusAdministrationClient, TopicProperties, ApiVersion from azure.servicebus._base_handler import ServiceBusSharedKeyCredential -from utilities import get_logger +from tests.utilities import get_logger from azure.core.exceptions import HttpResponseError, ResourceExistsError from devtools_testutils import AzureMgmtRecordedTestCase, CachedResourceGroupPreparer, recorded_by_proxy -from sb_env_loader import ( +from tests.sb_env_loader import ( ServiceBusPreparer )