test setup

Author: danielgerlag

src/samples/WorkflowCore.TestSample01/WorkflowCore.TestSample01.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>    
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

test/Docker.Testify/DockerSetup.cs

@@ -30,7 +30,7 @@ public abstract class DockerSetup : IDisposable
         protected readonly DockerClient docker;
     	protected string containerId;
 
-        private static object Lock = new object();
+        private static HashSet<int> UsedPorts = new HashSet<int>();
 
         protected DockerSetup()
         {
@@ -124,7 +124,7 @@ public void Dispose()
 
         private int GetFreePort()
         {
-            lock (Lock)
+            lock (UsedPorts)
             {
                 const int startRange = 1000;
                 const int endRange = 10000;
@@ -134,11 +134,13 @@ private int GetFreePort()
 
                 var result = startRange;
 
-                while (((tcpPorts.Any(x => x.Port == result)) || (udpPorts.Any(x => x.Port == result))) && result <= endRange)
+                while (((tcpPorts.Any(x => x.Port == result)) || (udpPorts.Any(x => x.Port == result))) && result <= endRange && !UsedPorts.Contains(result))
                     result++;
 
                 if (result > endRange)
                     throw new PortsInUseException();
+                
+                UsedPorts.Add(result);
 
                 return result;
             }