fixup

rabbitmq · May 1, 2024 · 8e84d74 · 8e84d74
1 parent 87fa5ad
commit 8e84d74
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -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
         {

diff --git a/projects/RabbitMQ.Client/client/impl/Connection.cs b/projects/RabbitMQ.Client/client/impl/Connection.cs
@@ -428,6 +428,7 @@ private async Task FinishCloseAsync(CancellationToken cancellationToken)
 
             await _frameHandler.CloseAsync(cancellationToken)
                 .ConfigureAwait(false);
+
             _channel0.SetCloseReason(CloseReason);
 
             await _channel0.FinishCloseAsync()

diff --git a/projects/Test/Common/IntegrationFixture.cs b/projects/Test/Common/IntegrationFixture.cs
@@ -175,12 +175,13 @@ public virtual async Task DisposeAsync()
         {
             try
             {
-                if (_channel != null)
+                if (_conn != null && _conn.IsOpen &&
+                    _channel != null && _channel.IsOpen)
                 {
                     await _channel.CloseAsync();
                 }
 
-                if (_conn != null)
+                if (_conn != null && _conn.IsOpen)
                 {
                     await _conn.CloseAsync();
                 }

diff --git a/projects/Test/Integration/TestConnectionShutdown.cs b/projects/Test/Integration/TestConnectionShutdown.cs
@@ -105,8 +105,7 @@ public async Task TestDisposedWithSocketClosedOutOfBand()
             _conn.Dispose();
             _conn = null;
 
-            TimeSpan waitSpan = TimeSpan.FromSeconds(10);
-            await WaitAsync(tcs, waitSpan, "channel shutdown");
+            await WaitAsync(tcs, TimeSpan.FromSeconds(10), "channel shutdown");
         }
 
         [Fact]