[ServiceBus] fix failing uamqp tests (Azure#37099)

* [ServiceBus] fix tests failing in uamqp

* only run uamqp tests

* remove uamqp

* add connection verify exception back to test

* temp - add back uamqp

Author: swathipil

sdk/servicebus/azure-servicebus/dev_requirements.txt

@@ -4,4 +4,5 @@
 azure-mgmt-servicebus~=8.0.0
 aiohttp>=3.0
 websocket-client
-azure-mgmt-resource<=16.0.0
+azure-mgmt-resource<=16.0.0
+uamqp

sdk/servicebus/azure-servicebus/tests/async_tests/test_sb_client_async.py

@@ -12,6 +12,7 @@
 import hmac
 import hashlib
 import base64
+import certifi
 from urllib.parse import quote as url_parse_quote
 
 from azure.core.credentials import AzureSasCredential, AzureNamedKeyCredential, AccessToken
@@ -661,14 +662,23 @@ async def test_custom_endpoint_connection_verify_exception_async(self,
         hostname = f"{servicebus_namespace.name}{SERVICEBUS_ENDPOINT_SUFFIX}"
         credential = AzureNamedKeyCredential(servicebus_namespace_key_name, servicebus_namespace_primary_key)
 
-        client = ServiceBusClient(hostname, credential, connection_verify="cacert.pem", uamqp_transport=uamqp_transport)
+        # ensure regular connection_verify works
+        certfile = certifi.where()
+        client = ServiceBusClient(hostname, credential, connection_verify=certfile, uamqp_transport=uamqp_transport)
+        async with client:
+            async with client.get_queue_sender(servicebus_queue.name) as sender:
+                await sender.send_messages(ServiceBusMessage("foo"))
+
+        # invalid cert file to connection_verify should fail
+        client = ServiceBusClient(hostname, credential, connection_verify="fakecertfile.pem", uamqp_transport=uamqp_transport)
         async with client:
             with pytest.raises(ServiceBusError):
                 async with client.get_queue_sender(servicebus_queue.name) as sender:
                     await sender.send_messages(ServiceBusMessage("foo"))
 
         # Skipping on OSX uamqp - it's raising an Authentication/TimeoutError
         if not uamqp_transport or not sys.platform.startswith('darwin'):
+            # invalid custom endpoint should fail
             fake_addr = "fakeaddress.com:1111"
             client = ServiceBusClient(
                 hostname,
@@ -686,7 +696,7 @@ async def test_custom_endpoint_connection_verify_exception_async(self,
                 hostname,
                 credential,
                 custom_endpoint_address=fake_addr,
-                connection_verify="cacert.pem",
+                connection_verify=certfile,
                 retry_total=0,
                 uamqp_transport=uamqp_transport,
             )

sdk/servicebus/azure-servicebus/tests/test_sb_client.py

@@ -13,6 +13,7 @@
 import hmac
 import hashlib
 import base64
+import certifi
 try:
     from urllib.parse import quote as url_parse_quote
 except ImportError:
@@ -689,14 +690,23 @@ def test_custom_endpoint_connection_verify_exception(self,
         hostname = f"{servicebus_namespace.name}{SERVICEBUS_ENDPOINT_SUFFIX}"
         credential = AzureNamedKeyCredential(servicebus_namespace_key_name, servicebus_namespace_primary_key)
 
-        client = ServiceBusClient(hostname, credential, connection_verify="cacert.pem", uamqp_transport=uamqp_transport)
+        # ensure regular connection_verify works
+        certfile = certifi.where()
+        client = ServiceBusClient(hostname, credential, connection_verify=certfile, uamqp_transport=uamqp_transport)
+        with client:
+            with client.get_queue_sender(servicebus_queue.name) as sender:
+                sender.send_messages(ServiceBusMessage("foo"))
+
+        # invalid cert file to connection_verify should fail
+        client = ServiceBusClient(hostname, credential, connection_verify="fakecertfile.pem", uamqp_transport=uamqp_transport)
         with client:
             with pytest.raises(ServiceBusError):
                 with client.get_queue_sender(servicebus_queue.name) as sender:
                     sender.send_messages(ServiceBusMessage("foo"))
 
         # Skipping on OSX uamqp - it's raising an Authentication/TimeoutError
         if not uamqp_transport or not sys.platform.startswith('darwin'):
+            # invalid custom endpoint should fail
             fake_addr = "fakeaddress.com:1111"
             client = ServiceBusClient(
                 hostname,
@@ -714,7 +724,7 @@ def test_custom_endpoint_connection_verify_exception(self,
                 hostname,
                 credential,
                 custom_endpoint_address=fake_addr,
-                connection_verify="cacert.pem",
+                connection_verify=certfile,
                 retry_total=0,
                 uamqp_transport=uamqp_transport,
             )

sdk/servicebus/tests.yml

@@ -4,7 +4,7 @@ extends:
     template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
       ServiceDirectory: servicebus
-      TestTimeoutInMinutes: 480
+      TestTimeoutInMinutes: 960
       UseFederatedAuth: true
       BuildTargetingString: azure-servicebus*
       EnvVars: