Skip to content

Commit 103c39e

Browse files
lukebakkenlukebakken
authored
Merge pull request #1742 from rabbitmq/lukebakken/minor-naming-change
Address flaky integration tests
2 parents a8dc8ce + cf830aa commit 103c39e

File tree

14 files changed

+104
-41
lines changed

14 files changed

+104
-41
lines changed

‎.ci/windows/toxiproxy/toxiproxy-cli.exe‎

401 KB
Binary file not shown.

‎.ci/windows/toxiproxy/toxiproxy-server.exe‎

-838 KB
Binary file not shown.

‎.github/workflows/build-test.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ jobs:
6969
- name: Integration Tests
7070
timeout-minutes: 25
7171
run: |
72-
$tx = Start-Job -Verbose -ScriptBlock { & "${{ github.workspace }}\.ci\windows\toxiproxy\toxiproxy-server.exe" }; `
73-
Start-Sleep -Seconds 1; `
74-
Receive-Job -Job $tx; `
75-
& "${{ github.workspace }}\.ci\windows\toxiproxy\toxiproxy-cli.exe" list; `
72+
Start-Job -Verbose -ScriptBlock { & "${{ github.workspace }}\.ci\windows\toxiproxy\toxiproxy-server.exe" }; `
7673
dotnet test `
7774
--environment 'RABBITMQ_LONG_RUNNING_TESTS=true' `
7875
--environment "RABBITMQ_RABBITMQCTL_PATH=${{ steps.install-start-rabbitmq.outputs.path }}" `
@@ -82,7 +79,10 @@ jobs:
8279
"${{ github.workspace }}\projects\Test\Integration\Integration.csproj" --no-restore --no-build --logger 'console;verbosity=detailed'
8380
- name: Check for errors in RabbitMQ logs
8481
run: ${{ github.workspace }}\.ci\windows\gha-log-check.ps1
85-
- name: Maybe upload RabbitMQ logs
82+
- name: Maybe collect Toxiproxy logs
83+
if: failure()
84+
run: Get-Job | Where-Object { $_.HasMoreData } | Receive-Job | Out-File -Append -LiteralPath $env:APPDATA\RabbitMQ\log\toxiproxy-log.txt
85+
- name: Maybe upload RabbitMQ and Toxiproxy logs
8686
if: failure()
8787
uses: actions/upload-artifact@v4
8888
with:

‎projects/Test/Common/IntegrationFixture.cs‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,9 @@ public abstract class IntegrationFixture : IAsyncLifetime
8484
public static readonly TimeSpan RecoveryInterval = TimeSpan.FromSeconds(2);
8585
public static readonly TimeSpan TestTimeout = TimeSpan.FromSeconds(5);
8686
public static readonly TimeSpan RequestedConnectionTimeout = TimeSpan.FromSeconds(1);
87-
public static readonly Random S_Random;
8887

8988
static IntegrationFixture()
9089
{
91-
92-
#if NET
93-
S_Random = Random.Shared;
94-
#else
95-
S_Random = new Random();
96-
#endif
9790
s_isRunningInCI = InitIsRunningInCI();
9891
s_isVerbose = InitIsVerbose();
9992

@@ -450,12 +443,19 @@ protected async Task WithTemporaryChannelAsync(Func<IChannel, Task> action)
450443

451444
protected string GenerateExchangeName()
452445
{
453-
return $"{_testDisplayName}-exchange-{Guid.NewGuid()}";
446+
return $"{_testDisplayName}-exchange-{Now}-{GenerateShortUuid()}";
454447
}
455448

456-
protected string GenerateQueueName()
449+
protected string GenerateQueueName(bool useGuid = false)
457450
{
458-
return $"{_testDisplayName}-queue-{Guid.NewGuid()}";
451+
if (useGuid)
452+
{
453+
return $"{_testDisplayName}-queue-{Now}-{Guid.NewGuid()}";
454+
}
455+
else
456+
{
457+
return $"{_testDisplayName}-queue-{Now}-{GenerateShortUuid()}";
458+
}
459459
}
460460

461461
protected Task WithTemporaryNonExclusiveQueueAsync(Func<IChannel, string, Task> action)
@@ -540,7 +540,7 @@ protected ConnectionFactory CreateConnectionFactory(
540540
{
541541
return new ConnectionFactory
542542
{
543-
ClientProvidedName = $"{_testDisplayName}:{Util.Now}:{GetConnectionIdx()}",
543+
ClientProvidedName = $"{_testDisplayName}:{Now}:{GetConnectionIdx()}",
544544
ContinuationTimeout = WaitSpan,
545545
HandshakeContinuationTimeout = WaitSpan,
546546
ConsumerDispatchConcurrency = consumerDispatchConcurrency
@@ -631,10 +631,16 @@ protected static string GetUniqueString(ushort length)
631631
protected static byte[] GetRandomBody(ushort size = 1024)
632632
{
633633
byte[] body = new byte[size];
634-
S_Random.NextBytes(body);
634+
Util.S_Random.NextBytes(body);
635635
return body;
636636
}
637637

638+
protected static string Now => Util.Now;
639+
640+
protected static string GenerateShortUuid() => Util.GenerateShortUuid();
641+
642+
protected static int RandomNext(int min, int max) => Util.S_Random.Next(min, max);
643+
638644
protected static Task WaitForRecoveryAsync(IConnection conn)
639645
{
640646
TaskCompletionSource<bool> tcs = PrepareForRecovery((AutorecoveringConnection)conn);

‎projects/Test/Common/Util.cs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ namespace Test
1010
{
1111
public class Util : IDisposable
1212
{
13+
#if NET
14+
private static readonly Random s_random = Random.Shared;
15+
#else
16+
[ThreadStatic]
17+
private static Random s_random;
18+
#endif
19+
1320
private readonly ITestOutputHelper _output;
1421
private readonly ManagementClient _managementClient;
1522
private static readonly bool s_isWindows = false;
@@ -41,6 +48,21 @@ public Util(ITestOutputHelper output, string managementUsername, string manageme
4148
_managementClient = new ManagementClient(managementUri, managementUsername, managementPassword);
4249
}
4350

51+
public static Random S_Random
52+
{
53+
get
54+
{
55+
#if NET
56+
return s_random;
57+
#else
58+
s_random ??= new Random();
59+
return s_random;
60+
#endif
61+
}
62+
}
63+
64+
public static string GenerateShortUuid() => S_Random.Next().ToString("x");
65+
4466
public static string Now => DateTime.UtcNow.ToString("s", CultureInfo.InvariantCulture);
4567

4668
public static bool IsWindows => s_isWindows;

‎projects/Test/Integration/ConnectionRecovery/TestQueueRecovery.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public async Task TestQueueRecoveryWithManyQueues()
5252
int n = 1024;
5353
for (int i = 0; i < n; i++)
5454
{
55-
QueueDeclareOk q = await _channel.QueueDeclareAsync(GenerateQueueName(), false, false, false);
55+
QueueDeclareOk q = await _channel.QueueDeclareAsync(GenerateQueueName(useGuid: true), false, false, false);
5656
qs.Add(q.QueueName);
5757
}
5858
await CloseAndWaitForRecoveryAsync();

‎projects/Test/Integration/TestAsyncConsumer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ await _channel.BasicPublishAsync(exchange: string.Empty, routingKey: queueName,
703703

704704
private async Task ValidateConsumerDispatchConcurrency()
705705
{
706-
ushort expectedConsumerDispatchConcurrency = (ushort)S_Random.Next(3, 10);
706+
ushort expectedConsumerDispatchConcurrency = (ushort)RandomNext(3, 10);
707707
AutorecoveringChannel autorecoveringChannel = (AutorecoveringChannel)_channel;
708708
Assert.Equal(ConsumerDispatchConcurrency, autorecoveringChannel.ConsumerDispatcher.Concurrency);
709709
Assert.Equal(_consumerDispatchConcurrency, autorecoveringChannel.ConsumerDispatcher.Concurrency);

‎projects/Test/Integration/TestConcurrentAccessBase.cs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected async Task TestConcurrentOperationsAsync(Func<Task> action, int iterat
5454
{
5555
for (int j = 0; j < iterations; j++)
5656
{
57-
await Task.Delay(S_Random.Next(1, 10));
57+
await Task.Delay(RandomNext(1, 10));
5858
tasks.Add(action());
5959
}
6060
}

‎projects/Test/Integration/TestConnectionRecoveryWithoutSetup.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public async Task TestConsumerWorkServiceRecovery()
114114
await using AutorecoveringConnection c = await CreateAutorecoveringConnectionAsync();
115115
await using (IChannel ch = await c.CreateChannelAsync())
116116
{
117-
string q = (await ch.QueueDeclareAsync("dotnet-client.recovery.consumer_work_pool1",
117+
string q = (await ch.QueueDeclareAsync(GenerateQueueName(),
118118
false, false, false)).QueueName;
119119
var cons = new AsyncEventingBasicConsumer(ch);
120120
await ch.BasicConsumeAsync(q, true, cons);
@@ -143,7 +143,7 @@ public async Task TestConsumerWorkServiceRecovery()
143143
[Fact]
144144
public async Task TestConsumerRecoveryOnClientNamedQueueWithOneRecovery()
145145
{
146-
const string q0 = "dotnet-client.recovery.queue1";
146+
string q0 = GenerateQueueName();
147147
// connection #1
148148
await using AutorecoveringConnection c = await CreateAutorecoveringConnectionAsync();
149149
await using (IChannel ch = await c.CreateChannelAsync())
@@ -364,8 +364,7 @@ public async Task TestTopologyRecoveryConsumerFilter()
364364
[Fact]
365365
public async Task TestRecoveryWithTopologyDisabled()
366366
{
367-
string queueName = GenerateQueueName() + "-dotnet-client.test.recovery.q2";
368-
367+
string queueName = GenerateQueueName();
369368
await using AutorecoveringConnection conn = await CreateAutorecoveringConnectionWithTopologyRecoveryDisabledAsync();
370369
await using (IChannel ch = await conn.CreateChannelAsync())
371370
{

‎projects/Test/Integration/TestExchangeDeclare.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ async Task f()
6262
{
6363
try
6464
{
65-
await Task.Delay(S_Random.Next(5, 50));
65+
await Task.Delay(RandomNext(5, 50));
6666
string exchangeName = GenerateExchangeName();
6767
await _channel.ExchangeDeclareAsync(exchange: exchangeName, type: "fanout", false, false);
6868
await _channel.ExchangeBindAsync(destination: ex_destination, source: exchangeName, routingKey: "unused");
@@ -87,7 +87,7 @@ async Task f()
8787
{
8888
try
8989
{
90-
await Task.Delay(S_Random.Next(5, 50));
90+
await Task.Delay(RandomNext(5, 50));
9191
await _channel.ExchangeUnbindAsync(destination: ex_destination, source: exchangeName, routingKey: "unused",
9292
noWait: false, arguments: null);
9393
await _channel.ExchangeDeleteAsync(exchange: exchangeName, ifUnused: false);

0 commit comments

Comments
 (0)