[EH/SB] pyAMQP retries (Azure#39037)

* hardcode to 0

* update

* eh

* fix reconnect test to reflect retry

* remove

Author: l0lawrence

sdk/eventhub/azure-eventhub/azure/eventhub/_transport/_pyamqp_transport.py

@@ -208,7 +208,9 @@ def create_retry_policy(config):
 
         """
         return errors.RetryPolicy(
-            retry_total=config.max_retries,
+            # hardcoding to 0 to avoid double retries and
+            # 8 seconds of wait time when retrying compared to uamqp
+            retry_total=0,
             retry_backoff_factor=config.backoff_factor,
             retry_backoff_max=config.backoff_max,
             retry_mode=config.retry_mode,

sdk/eventhub/azure-eventhub/tests/livetest/asynctests/test_reconnect_async.py

@@ -169,18 +169,8 @@ async def test_send_connection_idle_timeout_and_reconnect_async(
             await asyncio.sleep(11)
             ed = transform_outbound_single_message(ed, EventData, amqp_transport.to_outgoing_amqp_message)
             sender._unsent_events = [ed._message]
-            await sender._send_event_data()
-
-    retry = 0
-    while retry < 3:
-        try:
-            messages = receivers[0].receive_message_batch(max_batch_size=10, timeout=10 * timeout_factor)
-            if messages:
-                received_ed1 = EventData._from_message(messages[0])
-                assert received_ed1.body_as_str() == "data"
-                break
-        except timeout_exc:
-            retry += 1
+            with pytest.raises(error.AMQPConnectionError):
+                await sender._send_event_data()
 
 
 @pytest.mark.liveTest

sdk/eventhub/azure-eventhub/tests/livetest/synctests/test_reconnect.py

@@ -157,19 +157,8 @@ def test_send_connection_idle_timeout_and_reconnect_sync(auth_credential_receive
             time.sleep(11)
             ed = transform_outbound_single_message(ed, EventData, amqp_transport.to_outgoing_amqp_message)
             sender._unsent_events = [ed._message]
-            sender._send_event_data()
-
-    retry = 0
-    while retry < 3:
-        try:
-            messages = receivers[0].receive_message_batch(max_batch_size=10, timeout=10 * timeout_factor)
-            if messages:
-                received_ed1 = EventData._from_message(messages[0])
-                assert received_ed1.body_as_str() == "data"
-                break
-        except timeout_exc:
-            retry += 1
-
+            with pytest.raises(error.AMQPConnectionError):
+                sender._send_event_data()
 
 @pytest.mark.liveTest
 def test_receive_connection_idle_timeout_and_reconnect_sync(auth_credential_senders, uamqp_transport):

sdk/servicebus/azure-servicebus/azure/servicebus/_transport/_pyamqp_transport.py

@@ -412,7 +412,9 @@ def create_retry_policy(config: "Configuration", *, is_session: bool = False) ->
         # TODO: What's the retry overlap between servicebus and pyamqp?
         return _ServiceBusErrorPolicy(
             is_session=is_session,
-            retry_total=config.retry_total,
+            # hardcoding to 0 to avoid double retries and
+            # 8 seconds of wait time when retrying compared to uamqp
+            retry_total=0,
             retry_backoff_factor=config.retry_backoff_factor,
             retry_backoff_max=config.retry_backoff_max,
             retry_mode=config.retry_mode,