refactor port wait strategy + strategy execution

testcontainers · Oct 15, 2023 · 39748dc · 39748dc
1 parent 9940c4d
commit 39748dc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/lib/docker/api.ex b/lib/docker/api.ex
@@ -27,8 +27,15 @@ defmodule Testcontainers.Docker.Api do
          :ok <-
            if(!Enum.empty?(wait_strategies),
              do:
-               Enum.each(wait_strategies, fn wait_strategy ->
-                 WaitStrategy.wait_until_container_is_ready(wait_strategy, container.container_id)
+               Enum.reduce(wait_strategies, :ok, fn
+                 wait_strategy, :ok ->
+                   WaitStrategy.wait_until_container_is_ready(
+                     wait_strategy,
+                     container.container_id
+                   )
+
+                 _, error ->
+                   error
                end),
              else: :ok
            ) do

diff --git a/lib/wait_strategy/port_wait_strategy.ex b/lib/wait_strategy/port_wait_strategy.ex
@@ -21,13 +21,17 @@ defimpl Testcontainers.WaitStrategy, for: Testcontainers.WaitStrategy.PortWaitSt
     with {:ok, %Container{} = container} <- Docker.Api.get_container(id_or_name) do
       host_port = Container.mapped_port(container, wait_strategy.port)
 
-      case wait_for_port(wait_strategy.ip, host_port, wait_strategy.timeout) do
-        {:ok, :port_is_open} ->
-          :ok
+      if host_port == nil do
+        {:error, {:no_host_port, wait_strategy.port}}
+      else
+        case wait_for_port(wait_strategy.ip, host_port, wait_strategy.timeout) do
+          {:ok, :port_is_open} ->
+            :ok
 
-        _ ->
-          :timer.sleep(100)
-          wait_until_container_is_ready(wait_strategy, id_or_name)
+          _ ->
+            :timer.sleep(100)
+            wait_until_container_is_ready(wait_strategy, id_or_name)
+        end
       end
     end
   end