fix sb tests imports (#34772)

kashifkhan · web-flow · commit 138fddefd132 · 2024-03-14T14:08:39.000-05:00
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
@@ -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
@@ -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
@@ -34,15 +34,15 @@
     AutoLockRenewTimeout
 )
 from devtools_testutils import AzureMgmtRecordedTestCase
-from servicebus_preparer import (
+from tests.servicebus_preparer import (
     CachedServiceBusNamespacePreparer,
     CachedServiceBusQueuePreparer,
     ServiceBusTopicPreparer,
     ServiceBusQueuePreparer,
     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
@@ -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
@@ -17,15 +17,15 @@
 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,
     CachedServiceBusTopicPreparer,
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 )
 

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@`
`15`	`15`
`16`	`16`	`from devtools_testutils import AzureMgmtRecordedTestCase`
`17`	`17`	`from devtools_testutils.aio import recorded_by_proxy_async`
`18`		`-from sb_env_loader import (`
	`18`	`+from tests.sb_env_loader import (`
`19`	`19`	`ServiceBusPreparer`
`20`	`20`	`)`
`21`		`-from servicebus_preparer import (`
	`21`	`+from tests.servicebus_preparer import (`
`22`	`22`	`SERVICEBUS_ENDPOINT_SUFFIX`
`23`	`23`	`)`
`24`	`24`