Fix SB extension tests (#27349)

* Fix SB extension tests * Fix * Fix flaky tests
Azure · Mar 4, 2022 · 1538484 · 1538484
1 parent 35066c4
commit 1538484
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Processor/ProcessorLiveTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Processor/ProcessorLiveTests.cs
@@ -906,6 +906,8 @@ async Task ProcessMessage(ProcessMessageEventArgs args)
                     }
 
                     var initialLockedUntil = args.Message.LockedUntil;
+                    // introduce a small delay so that the service honors the renewal request
+                    await Task.Delay(500);
                     await args.RenewMessageLockAsync(args.Message);
                     Assert.Greater(args.Message.LockedUntil, initialLockedUntil);
                 }

diff --git a/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Processor/SessionProcessorLiveTests.cs b/sdk/servicebus/Azure.Messaging.ServiceBus/tests/Processor/SessionProcessorLiveTests.cs
@@ -693,6 +693,8 @@ async Task ProcessMessage(ProcessSessionMessageEventArgs args)
                     }
 
                     var initialLockedUntil = args.SessionLockedUntil;
+                    // introduce a small delay so that the service honors the renewal request
+                    await Task.Delay(500);
                     await args.RenewSessionLockAsync();
                     Assert.Greater(args.SessionLockedUntil, initialLockedUntil);
                 }

diff --git a/...servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/ServiceBusEndToEndTests.cs b/...servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/ServiceBusEndToEndTests.cs
@@ -1070,7 +1070,6 @@ public static void Run(
                 DateTimeOffset[] expiresAtArray,
                 DateTime[] enqueuedTimeUtcArray,
                 DateTimeOffset[] enqueuedTimeArray,
-                DateTimeOffset[] lockedUntilArray,
                 string[] contentTypeArray,
                 string[] replyToArray,
                 string[] toArray,
@@ -1097,8 +1096,7 @@ public static void Run(
                     Assert.Greater(expiresAtUtcArray[i], DateTime.UtcNow);
                     Assert.AreEqual(expiresAtArray[i].DateTime, expiresAtUtcArray[i]);
                     Assert.Less(enqueuedTimeUtcArray[i], DateTime.UtcNow);
-                    Assert.AreEqual(enqueuedTimeArray[i].DateTime, enqueuedTimeArray[i]);
-                    Assert.Greater(lockedUntilArray[i], DateTimeOffset.UtcNow);
+                    Assert.AreEqual(enqueuedTimeArray[i].DateTime, enqueuedTimeUtcArray[i]);
                 }
                 string[] messages = array.Select(x => x.Body.ToString()).ToArray();
                 ServiceBusMultipleTestJobsBase.ProcessMessages(messages);

diff --git a/...us/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/ServiceBusSessionsEndToEndTests.cs b/...us/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/ServiceBusSessionsEndToEndTests.cs
@@ -696,7 +696,7 @@ public class DrainModeTestJobQueueBatch
             public static async Task QueueWithSessionsBatch(
                 [ServiceBusTrigger(FirstQueueNameKey, IsSessionsEnabled = true)]
                 ServiceBusReceivedMessage[] array,
-                ServiceBusSessionMessageActions messageActions,
+                ServiceBusSessionMessageActions sessionActions,
                 CancellationToken cancellationToken,
                 ILogger logger)
             {
@@ -710,11 +710,11 @@ public static async Task QueueWithSessionsBatch(
                 foreach (ServiceBusReceivedMessage msg in array)
                 {
                     // validate that manual lock renewal works
-                    var initialLockedUntil = messageActions.SessionLockedUntil;
-                    await messageActions.RenewSessionLockAsync();
-                    Assert.Greater(messageActions.SessionLockedUntil, initialLockedUntil);
+                    var initialLockedUntil = sessionActions.SessionLockedUntil;
+                    await sessionActions.RenewSessionLockAsync();
+                    Assert.Greater(sessionActions.SessionLockedUntil, initialLockedUntil);
 
-                    await messageActions.CompleteMessageAsync(msg);
+                    await sessionActions.CompleteMessageAsync(msg);
                 }
 
                 _drainValidationPostDelay.Set();