Skip to content

Commit 7f5485b

Browse files
Fix flaky test ReceiveLotOfMessagesWithoutSettling in Microsoft.Azure.ServiceBus (Azure#19454)
* add changelog for a new nuget minor version bump * Revert "add changelog for a new nuget minor version bump" This reverts commit 7ece7b5. * add change log for amqp lib update * try to run failed tests * try to fix the flaky test * try to fix the flaky test * clean up unnecessary comments * make timeout a configurable parameter for test
1 parent 93c9ba9 commit 7f5485b

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

sdk/servicebus/Microsoft.Azure.ServiceBus/tests/QueueClientTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace Microsoft.Azure.ServiceBus.UnitTests
55
{
6+
using System;
67
using System.Collections.Generic;
78
using System.Linq;
89
using System.Threading.Tasks;
@@ -102,7 +103,7 @@ await ServiceBusScope.UsingQueueAsync(partitioned, sessionEnabled, async queueNa
102103
var queueClient = new QueueClient(TestUtility.NamespaceConnectionString, queueName, ReceiveMode.ReceiveAndDelete);
103104
try
104105
{
105-
await this.ReceiveDeleteTestCase(queueClient.InnerSender, queueClient.InnerReceiver, messageCount);
106+
await this.ReceiveDeleteTestCase(queueClient.InnerSender, queueClient.InnerReceiver, messageCount, TimeSpan.FromSeconds(10));
106107
}
107108
finally
108109
{

sdk/servicebus/Microsoft.Azure.ServiceBus/tests/SenderReceiverClientTestBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ internal async Task PeekLockTestCase(IMessageSender messageSender, IMessageRecei
2222
await TestUtility.CompleteMessagesAsync(messageReceiver, receivedMessages);
2323
}
2424

25-
internal async Task ReceiveDeleteTestCase(IMessageSender messageSender, IMessageReceiver messageReceiver, int messageCount)
25+
internal async Task ReceiveDeleteTestCase(IMessageSender messageSender, IMessageReceiver messageReceiver, int messageCount, TimeSpan timeout)
2626
{
2727
await TestUtility.SendMessagesAsync(messageSender, messageCount);
28-
var receivedMessages = await TestUtility.ReceiveMessagesAsync(messageReceiver, messageCount, TimeSpan.FromSeconds(10));
28+
var receivedMessages = await TestUtility.ReceiveMessagesAsync(messageReceiver, messageCount, timeout);
2929
Assert.Equal(messageCount, receivedMessages.Count);
3030
}
3131

sdk/servicebus/Microsoft.Azure.ServiceBus/tests/SenderReceiverTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ await ServiceBusScope.UsingQueueAsync(partitioned, sessionEnabled, async queueNa
4545
});
4646
}
4747

48-
[Fact(Skip="Flaky test. Tracked by #16265")]
48+
[Fact]
4949
[LiveTest]
5050
[DisplayTestMethodName]
5151
public async Task ReceiveLotOfMessagesWithoutSettling()
@@ -59,7 +59,7 @@ await ServiceBusScope.UsingQueueAsync(false, false, async queueName =>
5959

6060
try
6161
{
62-
await this.ReceiveDeleteTestCase(sender, receiver, messageCount);
62+
await this.ReceiveDeleteTestCase(sender, receiver, messageCount, TimeSpan.FromMinutes(2));
6363
}
6464
finally
6565
{

sdk/servicebus/Microsoft.Azure.ServiceBus/tests/TopicClientTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace Microsoft.Azure.ServiceBus.UnitTests
55
{
6+
using System;
67
using System.Collections.Generic;
78
using System.Threading.Tasks;
89
using Xunit;
@@ -65,7 +66,8 @@ await ServiceBusScope.UsingTopicAsync(partitioned, sessionEnabled, async (topicN
6566
this.ReceiveDeleteTestCase(
6667
topicClient.InnerSender,
6768
subscriptionClient.InnerSubscriptionClient.InnerReceiver,
68-
messageCount);
69+
messageCount,
70+
TimeSpan.FromSeconds(10));
6971
}
7072
finally
7173
{

0 commit comments

Comments
 (0)