Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix flaky test ReceiveLotOfMessagesWithoutSettling in Microsoft.Azure.ServiceBus #19454

Merged
merged 10 commits into from
Jun 10, 2021
Merged

Fix flaky test ReceiveLotOfMessagesWithoutSettling in Microsoft.Azure.ServiceBus #19454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7ece7b5
add changelog for a new nuget minor version bump
DorothySun216 Nov 20, 2020
00487b7
Revert "add changelog for a new nuget minor version bump"
DorothySun216 Nov 20, 2020
f730445
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-net
DorothySun216 Jan 12, 2021
43f8ab6
add change log for amqp lib update
DorothySun216 Jan 12, 2021
d1fc477
sync with upstream head
DorothySun216 Feb 23, 2021
113dffc
try to run failed tests
DorothySun216 Mar 11, 2021
e733d08
try to fix the flaky test
DorothySun216 May 25, 2021
b409060
try to fix the flaky test
DorothySun216 May 28, 2021
ea8e3d6
clean up unnecessary comments
DorothySun216 May 28, 2021
c1d76eb
make timeout a configurable parameter for test
DorothySun216 Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sdk/servicebus/Microsoft.Azure.ServiceBus/tests/QueueClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

namespace Microsoft.Azure.ServiceBus.UnitTests
{
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
Expand Down Expand Up @@ -102,7 +103,7 @@ await ServiceBusScope.UsingQueueAsync(partitioned, sessionEnabled, async queueNa
var queueClient = new QueueClient(TestUtility.NamespaceConnectionString, queueName, ReceiveMode.ReceiveAndDelete);
try
{
await this.ReceiveDeleteTestCase(queueClient.InnerSender, queueClient.InnerReceiver, messageCount);
await this.ReceiveDeleteTestCase(queueClient.InnerSender, queueClient.InnerReceiver, messageCount, TimeSpan.FromSeconds(10));
}
finally
{
Expand Down
4 changes: 2 additions & 2 deletions sdk/servicebus/Microsoft.Azure.ServiceBus/tests/SenderReceiverClientTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ internal async Task PeekLockTestCase(IMessageSender messageSender, IMessageRecei
await TestUtility.CompleteMessagesAsync(messageReceiver, receivedMessages);
}

internal async Task ReceiveDeleteTestCase(IMessageSender messageSender, IMessageReceiver messageReceiver, int messageCount)
internal async Task ReceiveDeleteTestCase(IMessageSender messageSender, IMessageReceiver messageReceiver, int messageCount, TimeSpan timeout)
{
await TestUtility.SendMessagesAsync(messageSender, messageCount);
var receivedMessages = await TestUtility.ReceiveMessagesAsync(messageReceiver, messageCount, TimeSpan.FromSeconds(10));
var receivedMessages = await TestUtility.ReceiveMessagesAsync(messageReceiver, messageCount, timeout);
Assert.Equal(messageCount, receivedMessages.Count);
}

Expand Down
4 changes: 2 additions & 2 deletions sdk/servicebus/Microsoft.Azure.ServiceBus/tests/SenderReceiverTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ await ServiceBusScope.UsingQueueAsync(partitioned, sessionEnabled, async queueNa
});
}

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

try
{
await this.ReceiveDeleteTestCase(sender, receiver, messageCount);
await this.ReceiveDeleteTestCase(sender, receiver, messageCount, TimeSpan.FromMinutes(2));
}
finally
{
Expand Down
4 changes: 3 additions & 1 deletion sdk/servicebus/Microsoft.Azure.ServiceBus/tests/TopicClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

namespace Microsoft.Azure.ServiceBus.UnitTests
{
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Xunit;
Expand Down Expand Up @@ -65,7 +66,8 @@ await ServiceBusScope.UsingTopicAsync(partitioned, sessionEnabled, async (topicN
this.ReceiveDeleteTestCase(
topicClient.InnerSender,
subscriptionClient.InnerSubscriptionClient.InnerReceiver,
messageCount);
messageCount,
TimeSpan.FromSeconds(10));
}
finally
{
Expand Down