simplify strategy execution

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

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/lib/docker/api.ex b/lib/docker/api.ex
@@ -9,7 +9,7 @@ defmodule Testcontainers.Docker.Api do
 
   def run(%Container{} = container_config, options \\ []) do
     on_exit = Keyword.get(options, :on_exit, nil)
-    wait_strategies = container_config.wait_strategies
+    wait_strategies = container_config.wait_strategies || []
     create_request = container_create_request(container_config)
 
     with :ok <- pull_image(create_request."Image", recv_timeout: 60_000),
@@ -25,20 +25,16 @@ defmodule Testcontainers.Docker.Api do
             end),
          {:ok, container} <- get_container(id),
          :ok <-
-           if(!Enum.empty?(wait_strategies),
-             do:
-               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
+           Enum.reduce(wait_strategies, :ok, fn
+             wait_strategy, :ok ->
+               WaitStrategy.wait_until_container_is_ready(
+                 wait_strategy,
+                 container.container_id
+               )
+
+             _, error ->
+               error
+           end) do
       {:ok, container}
     else
       {:error, other} -> {:error, other}

diff --git a/test/selenium_container_test.exs b/test/selenium_container_test.exs
@@ -11,7 +11,9 @@ defmodule Testcontainers.SeleniumContainerTest do
     container(:selenium, SeleniumContainer.new())
 
     test "provides a ready-to-use selenium container", %{selenium: selenium} do
+      assert Container.mapped_port(selenium, 4400) > 0
       assert Container.mapped_port(selenium, 4400) != 4400
+      assert Container.mapped_port(selenium, 7900) > 0
       assert Container.mapped_port(selenium, 7900) != 7900
     end
   end