Ensure enough ports are published for toxiproxy container

rabbitmq · Mar 23, 2024 · 8a1eb6b · 8a1eb6b
1 parent 981c6bc
commit 8a1eb6b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.ci/ubuntu/gha-setup.sh b/.ci/ubuntu/gha-setup.sh
@@ -47,7 +47,7 @@ function start_toxiproxy
             --name "$toxiproxy_docker_name" \
             --hostname "$toxiproxy_docker_name" \
             --publish 8474:8474 \
-            --publish 55672:55672 \
+            --publish 55670-55680:55670-55680 \
             --network "$docker_network_name" \
             'ghcr.io/shopify/toxiproxy:2.7.0'
     fi

diff --git a/projects/Test/Common/ProcessUtil.cs b/projects/Test/Common/ProcessUtil.cs
@@ -34,7 +34,6 @@
 using System.Diagnostics;
 using System.Text;
 using System.Threading.Tasks;
-using RabbitMQ.Client;
 
 namespace Test
 {
@@ -176,7 +175,7 @@ public static async Task<Result> RunAsync(ProcessStartInfo startInfo)
                         }
                         else
                         {
-                            Console.WriteLine("[WARNING] caught exception and re-trying: {0}", ex);
+                            Console.WriteLine("[WARNING] caught exception and re-trying ({0}): {1}", attempts, ex);
                         }
                     }
                     catch (TimeoutException ex)
@@ -188,7 +187,7 @@ public static async Task<Result> RunAsync(ProcessStartInfo startInfo)
                         }
                         else
                         {
-                            Console.WriteLine("[WARNING] caught exception and re-trying: {0}", ex);
+                            Console.WriteLine("[WARNING] caught exception and re-trying ({0}): {1}", attempts, ex);
                         }
                     }
 

diff --git a/projects/Test/Integration/TestToxiproxy.cs b/projects/Test/Integration/TestToxiproxy.cs
@@ -85,8 +85,8 @@ public ProxyManager(string testName, bool isRunningInCI, bool isWindows)
                 }
             }
 
-            Proxy p = _proxyClient.AddAsync(_proxy).GetAwaiter().GetResult();
-            Assert.True(p.Enabled);
+            _proxy = _proxyClient.AddAsync(_proxy).GetAwaiter().GetResult();
+            Assert.True(_proxy.Enabled);
         }
 
         public int ProxyPort => _proxyPort;