Skip to content

Fix TestThatDeletedQueueBindingsDontReappearOnRecovery #1554

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

Merged
merged 3 commits into from
May 1, 2024
Merged

Fix TestThatDeletedQueueBindingsDontReappearOnRecovery #1554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e88862
Fix `TestThatDeletedQueueBindingsDontReappearOnRecovery`
lukebakken May 1, 2024
0079ee7
* Stop using `amq.fanout` in tests
lukebakken May 1, 2024
1225118
Give windows-latest a try
lukebakken May 1, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/build-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
build-win32:
runs-on: windows-2019
runs-on: windows-latest
# https://github.com/NuGet/Home/issues/11548
env:
NUGET_CERT_REVOCATION_MODE: offline
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
projects/RabbitMQ.*/bin
integration-win32:
needs: build-win32
runs-on: windows-2019
runs-on: windows-latest
# https://github.com/NuGet/Home/issues/11548
env:
NUGET_CERT_REVOCATION_MODE: offline
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
path: ~/AppData/Roaming/RabbitMQ/log/
sequential-integration-win32:
needs: build-win32
runs-on: windows-2019
runs-on: windows-latest
# https://github.com/NuGet/Home/issues/11548
env:
NUGET_CERT_REVOCATION_MODE: offline
Expand Down
3 changes: 2 additions & 1 deletion build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ if ($RunTests)
dotnet test $csproj_file --environment 'RABBITMQ_LONG_RUNNING_TESTS=true' --no-restore --no-build --logger "console;verbosity=detailed"
if ($LASTEXITCODE -ne 0)
{
Write-Host "[WARNING] tests errored, exiting" -Foreground "Red"
Write-Host "[ERROR] tests errored, exiting" -Foreground "Red"
Exit 1
}
else
{
Expand Down
18 changes: 11 additions & 7 deletions projects/Test/Integration/ConnectionRecovery/TestExchangeRecovery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,29 @@ public async Task TestExchangeRecoveryTest()
public async Task TestExchangeToExchangeBindingRecovery()
{
string q = (await _channel.QueueDeclareAsync("", false, false, false)).QueueName;
string x1 = "amq.fanout";
string x2 = GenerateExchangeName();

await _channel.ExchangeDeclareAsync(x2, "fanout");
await _channel.ExchangeBindAsync(x1, x2, "");
await _channel.QueueBindAsync(q, x1, "");
string ex_source = GenerateExchangeName();
string ex_destination = GenerateExchangeName();

await _channel.ExchangeDeclareAsync(ex_source, ExchangeType.Fanout);
await _channel.ExchangeDeclareAsync(ex_destination, ExchangeType.Fanout);

await _channel.ExchangeBindAsync(destination: ex_destination, source: ex_source, "");
await _channel.QueueBindAsync(q, ex_destination, "");

try
{
await CloseAndWaitForRecoveryAsync();
Assert.True(_channel.IsOpen);
await _channel.BasicPublishAsync(x2, "", _encoding.GetBytes("msg"));
await _channel.BasicPublishAsync(ex_source, "", _encoding.GetBytes("msg"));
await AssertMessageCountAsync(q, 1);
}
finally
{
await WithTemporaryChannelAsync(async ch =>
{
await ch.ExchangeDeleteAsync(x2);
await ch.ExchangeDeleteAsync(ex_source);
await ch.ExchangeDeleteAsync(ex_destination);
await ch.QueueDeleteAsync(q);
});
}
Expand Down
40 changes: 24 additions & 16 deletions projects/Test/Integration/ConnectionRecovery/TestRecoveryWithDeletedEntities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,30 @@ public TestRecoveryWithDeletedEntities(ITestOutputHelper output) : base(output)
public async Task TestThatDeletedExchangeBindingsDontReappearOnRecovery()
{
string q = (await _channel.QueueDeclareAsync("", false, false, false)).QueueName;
string x1 = "amq.fanout";
string x2 = GenerateExchangeName();

await _channel.ExchangeDeclareAsync(x2, "fanout");
await _channel.ExchangeBindAsync(x1, x2, "");
await _channel.QueueBindAsync(q, x1, "");
await _channel.ExchangeUnbindAsync(x1, x2, "");
string ex_source = GenerateExchangeName();
string ex_destination = GenerateExchangeName();

await _channel.ExchangeDeclareAsync(ex_source, ExchangeType.Fanout);
await _channel.ExchangeDeclareAsync(ex_destination, ExchangeType.Fanout);

await _channel.ExchangeBindAsync(destination: ex_destination, source: ex_source, "");
await _channel.QueueBindAsync(q, ex_destination, "");
await _channel.ExchangeUnbindAsync(ex_destination, ex_source, "");

try
{
await CloseAndWaitForRecoveryAsync();
Assert.True(_channel.IsOpen);
await _channel.BasicPublishAsync(x2, "", _encoding.GetBytes("msg"));
await _channel.BasicPublishAsync(ex_source, "", _encoding.GetBytes("msg"));
await AssertMessageCountAsync(q, 0);
}
finally
{
await WithTemporaryChannelAsync(async ch =>
{
await ch.ExchangeDeleteAsync(x2);
await ch.ExchangeDeleteAsync(ex_source);
await ch.ExchangeDeleteAsync(ex_destination);
await ch.QueueDeleteAsync(q);
});
}
Expand Down Expand Up @@ -97,26 +101,30 @@ public async Task TestThatDeletedExchangesDontReappearOnRecovery()
public async Task TestThatDeletedQueueBindingsDontReappearOnRecovery()
{
string q = (await _channel.QueueDeclareAsync("", false, false, false)).QueueName;
string ex_amq_fanout = "amq.fanout";
string ex_test = GenerateExchangeName();

await _channel.ExchangeDeclareAsync(ex_test, ExchangeType.Fanout);
await _channel.ExchangeBindAsync(destination: ex_amq_fanout, source: ex_test, routingKey: "");
await _channel.QueueBindAsync(q, ex_amq_fanout, "");
await _channel.QueueUnbindAsync(q, ex_amq_fanout, "");
string ex_source = GenerateExchangeName();
string ex_destination = GenerateExchangeName();

await _channel.ExchangeDeclareAsync(ex_source, ExchangeType.Fanout);
await _channel.ExchangeDeclareAsync(ex_destination, ExchangeType.Fanout);

await _channel.ExchangeBindAsync(destination: ex_destination, source: ex_source, routingKey: "");
await _channel.QueueBindAsync(q, ex_destination, "");
await _channel.QueueUnbindAsync(q, ex_destination, "");

try
{
await CloseAndWaitForRecoveryAsync();
Assert.True(_channel.IsOpen);
await _channel.BasicPublishAsync(ex_test, "", _encoding.GetBytes("msg"));
await _channel.BasicPublishAsync(ex_source, "", _encoding.GetBytes("msg"));
await AssertMessageCountAsync(q, 0);
}
finally
{
await WithTemporaryChannelAsync(async ch =>
{
await ch.ExchangeDeleteAsync(ex_test);
await ch.ExchangeDeleteAsync(ex_source);
await ch.ExchangeDeleteAsync(ex_destination);
await ch.QueueDeleteAsync(q);
});
}
Expand Down
9 changes: 7 additions & 2 deletions projects/Test/Integration/TestExchangeDeclare.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ public async Task TestConcurrentExchangeDeclareAndBind()
{
var exchangeNames = new ConcurrentBag<string>();
var tasks = new List<Task>();

string ex_destination = GenerateExchangeName();
await _channel.ExchangeDeclareAsync(exchange: ex_destination, type: "fanout", false, false);

NotSupportedException nse = null;
for (int i = 0; i < 256; i++)
{
Expand All @@ -61,7 +65,7 @@ async Task f()
await Task.Delay(S_Random.Next(5, 50));
string exchangeName = GenerateExchangeName();
await _channel.ExchangeDeclareAsync(exchange: exchangeName, type: "fanout", false, false);
await _channel.ExchangeBindAsync(destination: "amq.fanout", source: exchangeName, routingKey: "unused");
await _channel.ExchangeBindAsync(destination: ex_destination, source: exchangeName, routingKey: "unused");
exchangeNames.Add(exchangeName);
}
catch (NotSupportedException e)
Expand All @@ -84,7 +88,7 @@ async Task f()
try
{
await Task.Delay(S_Random.Next(5, 50));
await _channel.ExchangeUnbindAsync(destination: "amq.fanout", source: exchangeName, routingKey: "unused",
await _channel.ExchangeUnbindAsync(destination: ex_destination, source: exchangeName, routingKey: "unused",
noWait: false, arguments: null);
await _channel.ExchangeDeleteAsync(exchange: exchangeName, ifUnused: false);
}
Expand All @@ -99,6 +103,7 @@ await _channel.ExchangeUnbindAsync(destination: "amq.fanout", source: exchangeNa

await AssertRanToCompletion(tasks);
Assert.Null(nse);
await _channel.ExchangeDeleteAsync(exchange: ex_destination);
}

[Fact]
Expand Down