Merge pull request #1288 from rabbitmq/lukebakken/flaky-test

Address some test flakes
rabbitmq · Feb 6, 2023 · 99768db · 99768db
2 parents f3ae7f8 + cb5d735
commit 99768db
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 8 deletions.
diff --git a/.ci/versions.json b/.ci/versions.json
@@ -1,4 +1,4 @@
 {
   "erlang": "25.2",
-  "rabbitmq": "3.11.5"
+  "rabbitmq": "3.11.6"
 }
diff --git a/projects/Unit/Fixtures.cs b/projects/Unit/Fixtures.cs
@@ -51,7 +51,7 @@ public class IntegrationFixture : IDisposable
         internal Encoding _encoding = new UTF8Encoding();
 
         public static TimeSpan RECOVERY_INTERVAL = TimeSpan.FromSeconds(2);
-
+        protected readonly TimeSpan _waitSpan;
         protected readonly ITestOutputHelper _output;
         protected readonly string _testDisplayName;
 
@@ -64,6 +64,15 @@ public IntegrationFixture(ITestOutputHelper output)
             _testDisplayName = test.DisplayName;
 
             SetUp();
+
+            if (IsRunningInCI())
+            {
+                _waitSpan = TimeSpan.FromSeconds(30);
+            }
+            else
+            {
+                _waitSpan = TimeSpan.FromSeconds(10);
+            }
         }
 
         protected virtual void SetUp()
@@ -400,7 +409,7 @@ internal void StartRabbitMQ()
 
         internal void Wait(ManualResetEventSlim latch)
         {
-            Assert.True(latch.Wait(TimeSpan.FromSeconds(10)), "waiting on a latch timed out");
+            Assert.True(latch.Wait(_waitSpan), "waiting on a latch timed out");
         }
 
         internal void Wait(ManualResetEventSlim latch, TimeSpan timeSpan)
@@ -416,6 +425,17 @@ public static string CertificatesDirectory()
         {
             return Environment.GetEnvironmentVariable("SSL_CERTS_DIR");
         }
+
+        private static bool IsRunningInCI()
+        {
+            string concourse = Environment.GetEnvironmentVariable("CONCOURSE_CI_BUILD");
+            string gha = Environment.GetEnvironmentVariable("GITHUB_ACTIONS");
+            if (String.IsNullOrWhiteSpace(concourse) && String.IsNullOrWhiteSpace(gha))
+            {
+                return false;
+            }
+            return true;
+        }
     }
 
     public class TimingFixture

diff --git a/projects/Unit/TestAsyncConsumer.cs b/projects/Unit/TestAsyncConsumer.cs
@@ -102,7 +102,7 @@ public async Task TestBasicRoundtripConcurrent()
 
                     var publish1SyncSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
                     var publish2SyncSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-                    var maximumWaitTime = TimeSpan.FromSeconds(5);
+                    var maximumWaitTime = TimeSpan.FromSeconds(10);
                     var tokenSource = new CancellationTokenSource(maximumWaitTime);
                     tokenSource.Token.Register(() =>
                     {
@@ -178,7 +178,7 @@ public async Task TestBasicRoundtripConcurrentManyMessages()
                     {
                         var publish1SyncSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
                         var publish2SyncSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-                        var maximumWaitTime = TimeSpan.FromSeconds(10);
+                        var maximumWaitTime = TimeSpan.FromSeconds(30);
                         var tokenSource = new CancellationTokenSource(maximumWaitTime);
                         tokenSource.Token.Register(() =>
                         {

diff --git a/projects/Unit/TestConnectionRecovery.cs b/projects/Unit/TestConnectionRecovery.cs
@@ -48,7 +48,7 @@ namespace RabbitMQ.Client.Unit
     public class TestConnectionRecovery : IntegrationFixture
     {
         private readonly byte[] _messageBody;
-        private readonly ushort _totalMessageCount = 1024;
+        private readonly ushort _totalMessageCount = 8192;
         private readonly ushort _closeAtCount = 16;
         private string _queueName;
 

diff --git a/projects/Unit/TestConsumer.cs b/projects/Unit/TestConsumer.cs
@@ -31,7 +31,7 @@ public async Task TestBasicRoundtripConcurrent()
 
                 var publish1SyncSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
                 var publish2SyncSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-                var maximumWaitTime = TimeSpan.FromSeconds(5);
+                var maximumWaitTime = TimeSpan.FromSeconds(10);
                 var tokenSource = new CancellationTokenSource(maximumWaitTime);
                 tokenSource.Token.Register(() =>
                 {

diff --git a/projects/Unit/TestPublisherConfirms.cs b/projects/Unit/TestPublisherConfirms.cs
@@ -134,7 +134,7 @@ public async Task TestWaitForConfirmsWithEvents()
                     // to be equal to N because acks can be batched,
                     // so we primarily care about event handlers being invoked
                     // in this test
-                    Assert.True(c > 5);
+                    Assert.True(c >= 1);
                 }
                 finally
                 {