Merge pull request #16 from devjoes/fix-ci-build-error

add timeout

Author: devjoes

DockerizedTesting.RabbitMQ/RabbitMqFixture.cs

@@ -52,6 +52,7 @@ public ConnectionFactory SetupConnectionFactory(ConnectionFactory connectionFact
             return connectionFactory;
         }
 
+        private int success = 0;
         protected override async Task<bool> IsContainerRunning(int[] ports)
         {
             try
@@ -68,10 +69,12 @@ protected override async Task<bool> IsContainerRunning(int[] ports)
 
                     }
                 }
-                return await Task.FromResult(true);
+                this.success++;
+                return await Task.FromResult(this.success >= 5); // Rabbit seems to work then stop?
             }
             catch
             {
+                this.success = 0;
                 return await Task.FromResult(false);
             }
         }

DockerizedTesting.RabbitMQ/RabbitMqFixtureOptions.cs

@@ -6,7 +6,7 @@ namespace DockerizedTesting.RabbitMQ
     public class RabbitMqFixtureOptions : FixtureOptions
     {
         public override IDockerImageProvider ImageProvider { get; } = new DockerHubImageProvider("bitnami/rabbitmq:latest");
-        public override int DelayMs => 2000;
+        public override int DelayMs => 5000;
         public string UserName { get; set; } = "user";
         public string Password { get; set; } = "D0cK3rIz3d_T3sting!!";
 

DockerizedTesting.Tests/ImageProviders/DockerProjectImageProviderTests.cs

@@ -47,11 +47,17 @@ protected async Task WaitForContainer(int[] ports)
         {
             this.ContainerStarted = false;
             int attempts = 0;
+            var sw = System.Diagnostics.Stopwatch.StartNew();
             do
             {
                 this.ContainerStarted = await this.IsContainerRunning(ports);
                 await Task.Delay(this.Options.DelayMs);
             } while (!this.ContainerStarted && attempts++ <= this.Options.MaxRetries);
+            sw.Stop();
+            if (!this.ContainerStarted)
+            {
+                throw new TimeoutException($"Container failed to start after {sw.Elapsed} ({this.Options.MaxRetries} attempts)");
+            }
         }
 
         protected async Task<string> StartContainer(int[] ports)
@@ -71,7 +77,6 @@ public virtual async Task Start(T opts)
             this.ContainerStarting = true;
             this.ContainerId = await this.StartContainer(this.Ports);
             await this.WaitForContainer(this.Ports);
-            this.ContainerStarted = true;
         }
 
         public bool IsDisposed { get; protected set; }

DockerizedTesting/Fixtures/BaseFixture.cs

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>