E2E tests clean-up (#3389)

Co-authored-by: Andy Kwong <andykwong@microsoft.com>
Azure · Oct 31, 2023 · a6817da · a6817da
1 parent 497f69b
commit a6817da
Show file tree

Hide file tree

Showing 9 changed files with 116 additions and 33 deletions.
diff --git a/e2e/test/iothub/SasCredentialAuthenticationTests.cs b/e2e/test/iothub/SasCredentialAuthenticationTests.cs
@@ -91,7 +91,9 @@ public async Task RegistryManager_Http_SasCredentialAuth_Renewed_Success()
             await registryManager.RemoveDeviceAsync(device.Id).ConfigureAwait(false);
         }
 
+        [Ignore] //Flaky Test
         [TestMethodWithRetry(Max=3)]
+        [TestCategory("Flaky")]
         [Timeout(TestTimeoutMilliseconds)]
         public async Task JobClient_Http_SasCredentialAuth_Success()
         {

diff --git a/...iothub/messaging/FaultInjectionPoolAmqpTests.MessageReceiveFaultInjectionPoolAmqpTests.cs b/...iothub/messaging/FaultInjectionPoolAmqpTests.MessageReceiveFaultInjectionPoolAmqpTests.cs
@@ -17,7 +17,8 @@ public partial class FaultInjectionPoolAmqpTests
     {
         private readonly string MessageReceive_DevicePrefix = $"{nameof(FaultInjectionPoolAmqpTests)}.MessagaeReceive";
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_TcpConnectionLossReceiveUsingCallbackRecovery_MultipleConnections_Amqp()
         {
@@ -30,7 +31,8 @@ await ReceiveMessageUsingCallbackRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_TcpConnectionLossReceiveUsingCallbackRecovery_MultipleConnections_AmqpWs()
         {
@@ -43,7 +45,8 @@ await ReceiveMessageUsingCallbackRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_AmqpConnectionLossReceiveUsingCallbackRecovery_MultipleConnections_Amqp()
         {
@@ -56,7 +59,8 @@ await ReceiveMessageUsingCallbackRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_AmqpConnectionLossReceiveUsingCallbackRecovery_MultipleConnections_AmqpWs()
         {
@@ -70,7 +74,8 @@ await ReceiveMessageUsingCallbackRecoveryPoolOverAmqpAsync(
         }
 
         // TODO: #950 - Link/session faults for message send/ method/ twin operations closes the connection.
-        [TestMethod]
+        [Ignore]
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_AmqpSessionLossReceiveUsingCallbackRecovery_MultipleConnections_Amqp()
         {
@@ -84,7 +89,8 @@ await ReceiveMessageUsingCallbackRecoveryPoolOverAmqpAsync(
         }
 
         // TODO: #950 - Link/session faults for message send/ method/ twin operations closes the connection.
-        [TestMethod]
+        [Ignore]
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_AmqpSessionLossReceiveUsingCallbackRecovery_MultipleConnections_AmqpWs()
         {
@@ -97,7 +103,8 @@ await ReceiveMessageUsingCallbackRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         [TestCategory("LongRunning")]
         public async Task Message_AmqpC2dLinkDropReceiveUsingCallbackRecovery_MultipleConnections_Amqp()
@@ -111,7 +118,8 @@ await ReceiveMessageUsingCallbackRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_AmqpC2dLinkDropReceiveUsingCallbackRecovery_MultipleConnections_AmqpWs()
         {
@@ -124,7 +132,8 @@ await ReceiveMessageUsingCallbackRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_GracefulShutdownReceiveUsingCallbackRecovery_MultipleConnections_Amqp()
         {
@@ -137,7 +146,8 @@ await ReceiveMessageUsingCallbackRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_GracefulShutdownReceiveUsingCallbackRecovery_MultipleConnections_AmqpWs()
         {

diff --git a/...st/iothub/messaging/FaultInjectionPoolAmqpTests.MessageSendFaultInjectionPoolAmqpTests.cs b/...st/iothub/messaging/FaultInjectionPoolAmqpTests.MessageSendFaultInjectionPoolAmqpTests.cs
@@ -233,6 +233,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_TcpConnectionLossSendRecovery_MultipleConnections_Amqp()
@@ -246,6 +247,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_TcpConnectionLossSendRecovery_MultipleConnections_AmqpWs()
@@ -259,6 +261,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_AmqpConnectionLossSendRecovery_MultipleConnections_Amqp()
@@ -272,6 +275,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_AmqpConnectionLossSendRecovery_MultipleConnections_AmqpWs()
@@ -286,6 +290,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
         }
 
         // TODO: #950 - Link/session faults for message send/ method/ twin operations closes the connection.
+        [Ignore]
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_AmqpSessionLossSendRecovery_MultipleConnections_Amqp()
@@ -300,6 +305,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
         }
 
         // TODO: #950 - Link/session faults for message send/ method/ twin operations closes the connection.
+        [Ignore]
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_AmqpSessionLossSendRecovery_MultipleConnections_AmqpWs()
@@ -314,6 +320,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
         }
 
         // TODO: #950 - Link/session faults for message send/ method/ twin operations closes the connection.
+        [Ignore]
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_AmqpD2cLinkDropSendRecovery_MultipleConnections_Amqp()
@@ -328,6 +335,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
         }
 
         // TODO: #950 - Link/session faults for message send/ method/ twin operations closes the connection.
+        [Ignore]
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_AmqpD2cLinkDropSendRecovery_MultipleConnections_AmqpWs()
@@ -341,6 +349,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         [TestCategory("LongRunning")]
@@ -355,6 +364,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_GracefulShutdownSendRecovery_MultipleConnections_AmqpWs()
@@ -368,6 +378,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_ThrottledConnectionRecovery_MultipleConnections_Amqp()
@@ -381,6 +392,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_ThrottledConnectionRecovery_MultipleConnections_AmqpWs()
@@ -394,6 +406,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         [ExpectedException(typeof(UnauthorizedException))]
@@ -408,6 +421,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
                 .ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         [ExpectedException(typeof(UnauthorizedException))]
@@ -423,6 +437,7 @@ await SendMessageRecoveryPoolOverAmqpAsync(
         }
 
         // Test device client recovery when proxy settings are enabled
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [TestCategory("Proxy")]
         [Timeout(LongRunningTestTimeoutMilliseconds)]

diff --git a/e2e/test/iothub/messaging/MessageReceiveE2EPoolAmqpTests.cs b/e2e/test/iothub/messaging/MessageReceiveE2EPoolAmqpTests.cs
@@ -70,7 +70,8 @@ await ReceiveMessagePoolOverAmqpAsync(
                 ConnectionStringAuthScope.IoTHub).ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_DeviceReceiveSingleMessage_MultipleConnections_Amqp()
         {
@@ -80,7 +81,8 @@ await ReceiveMessagePoolOverAmqpAsync(
                 PoolingOverAmqp.MultipleConnections_DevicesCount).ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_DeviceReceiveSingleMessage_MultipleConnections_AmqpWs()
         {
@@ -90,6 +92,7 @@ await ReceiveMessagePoolOverAmqpAsync(
                 PoolingOverAmqp.MultipleConnections_DevicesCount).ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_IoTHubSak_DeviceReceiveSingleMessage_MultipleConnections_Amqp()
@@ -101,6 +104,7 @@ await ReceiveMessagePoolOverAmqpAsync(
                 ConnectionStringAuthScope.IoTHub).ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_IoTHubSak_DeviceReceiveSingleMessage_MultipleConnections_AmqpWs()
@@ -112,7 +116,8 @@ await ReceiveMessagePoolOverAmqpAsync(
                 ConnectionStringAuthScope.IoTHub).ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_DeviceReceiveSingleMessageUsingCallback_MultipleConnections_Amqp()
         {
@@ -124,7 +129,8 @@ public async Task Message_DeviceReceiveSingleMessageUsingCallback_MultipleConnec
                 .ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_DeviceReceiveSingleMessageUsingCallback_MultipleConnections_AmqpWs()
         {
@@ -136,7 +142,8 @@ public async Task Message_DeviceReceiveSingleMessageUsingCallback_MultipleConnec
                 .ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_IoTHubSak_DeviceReceiveSingleMessageUsingCallback_MultipleConnections_Amqp()
         {
@@ -149,7 +156,8 @@ public async Task Message_IoTHubSak_DeviceReceiveSingleMessageUsingCallback_Mult
                 .ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_IoTHubSak_DeviceReceiveSingleMessageUsingCallback_MultipleConnections_AmqpWs()
         {
@@ -162,6 +170,7 @@ public async Task Message_IoTHubSak_DeviceReceiveSingleMessageUsingCallback_Mult
                 .ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_DeviceReceiveSingleMessageUsingCallbackAndUnsubscribe_MultipleConnections_Amqp()
@@ -174,6 +183,7 @@ public async Task Message_DeviceReceiveSingleMessageUsingCallbackAndUnsubscribe_
                 .ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_DeviceReceiveSingleMessageUsingCallbackAndUnsubscribe_MultipleConnections_AmqpWs()
@@ -186,6 +196,7 @@ public async Task Message_DeviceReceiveSingleMessageUsingCallbackAndUnsubscribe_
                 .ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_IoTHubSak_DeviceReceiveSingleMessageUsingCallbackAndUnsubscribe_MultipleConnections_Amqp()
@@ -199,6 +210,7 @@ public async Task Message_IoTHubSak_DeviceReceiveSingleMessageUsingCallbackAndUn
                 .ConfigureAwait(false);
         }
 
+        [Ignore] // TODO: Investigate timeout for this test
         [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_IoTHubSak_DeviceReceiveSingleMessageUsingCallbackAndUnsubscribe_MultipleConnections_AmqpWs()

diff --git a/e2e/test/iothub/messaging/MessageSendE2EPoolAmqpTests.cs b/e2e/test/iothub/messaging/MessageSendE2EPoolAmqpTests.cs
@@ -44,7 +44,8 @@ await SendMessagePoolOverAmqp(
                 .ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_DeviceSak_DeviceSendSingleMessage_MultipleConnections_Amqp()
         {
@@ -54,7 +55,8 @@ await SendMessagePoolOverAmqp(
                 PoolingOverAmqp.MultipleConnections_DevicesCount).ConfigureAwait(false);
         }
 
-        [TestMethod]
+        [Ignore] // TODO: Investigate timeout for this test
+        [TestMethodWithRetry(Max=3)]
         [Timeout(LongRunningTestTimeoutMilliseconds)]
         public async Task Message_DeviceSak_DeviceSendSingleMessage_MultipleConnections_AmqpWs()
         {