Wait longer when IsRunningInCI

Author: lukebakken

projects/Test/Common/IntegrationFixture.cs

@@ -44,6 +44,7 @@ namespace Test
 {
     public class IntegrationFixture : IDisposable
     {
+        private static bool s_isRunningInCI = false;
         private static int _connectionIdx = 0;
 
         protected readonly RabbitMQCtl _rabbitMQCtl;
@@ -67,9 +68,10 @@ public class IntegrationFixture : IDisposable
         static IntegrationFixture()
         {
             S_Random = new Random();
+            InitIsRunningInCI();
 
             int threadCount;
-            if (IsRunningInCI())
+            if (s_isRunningInCI)
             {
                 threadCount = _processorCount * 16;
                 WaitSpan = TimeSpan.FromSeconds(45);
@@ -136,6 +138,11 @@ protected virtual void TearDown()
         {
         }
 
+        protected bool IsRunningInCI
+        {
+            get { return s_isRunningInCI; }
+        }
+
         internal AutorecoveringConnection CreateAutorecoveringConnection(IList<string> hostnames)
         {
             return CreateAutorecoveringConnection(RecoveryInterval, hostnames);
@@ -285,31 +292,32 @@ protected void HandleChannelShutdown(IChannel ch, ShutdownEventArgs args, Action
             }
         }
 
-        private static int GetConnectionIdx()
-        {
-            return Interlocked.Increment(ref _connectionIdx);
-        }
-
-        private static bool IsRunningInCI()
+        private static void InitIsRunningInCI()
         {
-            bool ci = false;
-
+            bool ci;
             if (bool.TryParse(Environment.GetEnvironmentVariable("CI"), out ci))
             {
                 if (ci == true)
                 {
-                    return ci;
+                    s_isRunningInCI = true;
                 }
             }
             else if (bool.TryParse(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"), out ci))
             {
                 if (ci == true)
                 {
-                    return ci;
+                    s_isRunningInCI = true;
                 }
             }
+            else
+            {
+                s_isRunningInCI = false;
+            }
+        }
 
-            return ci;
+        private static int GetConnectionIdx()
+        {
+            return Interlocked.Increment(ref _connectionIdx);
         }
 
         protected static string GetUniqueString(ushort length)

projects/Test/Integration/TestConsumerOperationDispatch.cs

@@ -46,7 +46,7 @@ public class TestConsumerOperationDispatch : IntegrationFixture
         // number of messages to be published
         private const int N = 100;
 
-        private static readonly CountdownEvent counter = new CountdownEvent(Y);
+        private static readonly CountdownEvent s_counter = new CountdownEvent(Y);
 
         private const string _x = "dotnet.tests.consumer-operation-dispatch.fanout";
         private readonly List<IChannel> _channels = new List<IChannel>();
@@ -68,7 +68,7 @@ protected override void TearDown()
                 }
             }
 
-            counter.Reset();
+            s_counter.Reset();
         }
 
         private class CollectingConsumer : DefaultBasicConsumer
@@ -92,7 +92,7 @@ public override void HandleBasicDeliver(string consumerTag,
 
                 if (deliveryTag == N)
                 {
-                    counter.Signal();
+                    s_counter.Signal();
                 }
 
                 Channel.BasicAck(deliveryTag: deliveryTag, multiple: false);
@@ -121,7 +121,14 @@ public void TestDeliveryOrderingWithSingleChannel()
                 _channel.BasicPublish(_x, "", _encoding.GetBytes("msg"));
             }
 
-            counter.Wait(TimeSpan.FromMinutes(2));
+            if (IsRunningInCI)
+            {
+                s_counter.Wait(TimeSpan.FromMinutes(5));
+            }
+            else
+            {
+                s_counter.Wait(TimeSpan.FromMinutes(2));
+            }
 
             foreach (CollectingConsumer cons in _consumers)
             {