Skip to content

Commit 8e84d74

Browse files
committed
fixup
1 parent 87fa5ad commit 8e84d74

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

build.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ if ($RunTests)
2525
dotnet test $csproj_file --environment 'RABBITMQ_LONG_RUNNING_TESTS=true' --no-restore --no-build --logger "console;verbosity=detailed"
2626
if ($LASTEXITCODE -ne 0)
2727
{
28-
Write-Host "[WARNING] tests errored, exiting" -Foreground "Red"
28+
Write-Host "[ERROR] tests errored, exiting" -Foreground "Red"
29+
Exit 1
2930
}
3031
else
3132
{

projects/RabbitMQ.Client/client/impl/Connection.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,7 @@ private async Task FinishCloseAsync(CancellationToken cancellationToken)
428428

429429
await _frameHandler.CloseAsync(cancellationToken)
430430
.ConfigureAwait(false);
431+
431432
_channel0.SetCloseReason(CloseReason);
432433

433434
await _channel0.FinishCloseAsync()

projects/Test/Common/IntegrationFixture.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,13 @@ public virtual async Task DisposeAsync()
175175
{
176176
try
177177
{
178-
if (_channel != null)
178+
if (_conn != null && _conn.IsOpen &&
179+
_channel != null && _channel.IsOpen)
179180
{
180181
await _channel.CloseAsync();
181182
}
182183

183-
if (_conn != null)
184+
if (_conn != null && _conn.IsOpen)
184185
{
185186
await _conn.CloseAsync();
186187
}

projects/Test/Integration/TestConnectionShutdown.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ public async Task TestDisposedWithSocketClosedOutOfBand()
105105
_conn.Dispose();
106106
_conn = null;
107107

108-
TimeSpan waitSpan = TimeSpan.FromSeconds(10);
109-
await WaitAsync(tcs, waitSpan, "channel shutdown");
108+
await WaitAsync(tcs, TimeSpan.FromSeconds(10), "channel shutdown");
110109
}
111110

112111
[Fact]

0 commit comments

Comments
 (0)