Support explicit ExUnit.run

Author: josevalim

lib/ex_unit/lib/ex_unit.ex

@@ -350,6 +350,7 @@ defmodule ExUnit do
   """
   @spec run() :: suite_result()
   def run do
+    _ = ExUnit.Server.modules_loaded()
     options = persist_defaults(configuration())
     ExUnit.Runner.run(options, nil)
   end

lib/ex_unit/lib/ex_unit/server.ex

@@ -58,6 +58,10 @@ defmodule ExUnit.Server do
     {:reply, state.sync_modules, %{state | sync_modules: [], loaded: System.monotonic_time()}}
   end
 
+  def handle_call(:modules_loaded, _from, %{loaded: :done} = state) do
+    {:reply, 0, state}
+  end
+
   def handle_call(:modules_loaded, _from, %{loaded: loaded} = state) when is_integer(loaded) do
     diff = System.convert_time_unit(System.monotonic_time() - loaded, :native, :microsecond)
     {:reply, diff, take_modules(%{state | loaded: :done})}

lib/ex_unit/test/ex_unit/callbacks_test.exs

@@ -32,7 +32,6 @@ defmodule ExUnit.CallbacksTest do
       end
     end
 
-    ExUnit.Server.modules_loaded()
     assert capture_io(fn -> ExUnit.run() end) =~ "1 test, 0 failures"
   end
 
@@ -63,7 +62,6 @@ defmodule ExUnit.CallbacksTest do
       defp store_5(context), do: store(context, 5)
     end
 
-    ExUnit.Server.modules_loaded()
     assert capture_io(fn -> ExUnit.run() end) =~ "1 test, 0 failures"
   end
 
@@ -82,8 +80,6 @@ defmodule ExUnit.CallbacksTest do
       defp error, do: :error
     end
 
-    ExUnit.Server.modules_loaded()
-
     assert capture_io(fn -> ExUnit.run() end) =~
              "** (MatchError) no match of right hand side value: :error"
   end
@@ -103,8 +99,6 @@ defmodule ExUnit.CallbacksTest do
       defp error, do: :error
     end
 
-    ExUnit.Server.modules_loaded()
-
     assert capture_io(fn -> ExUnit.run() end) =~
              "** (MatchError) no match of right hand side value: :error"
   end
@@ -124,7 +118,6 @@ defmodule ExUnit.CallbacksTest do
       end
     end
 
-    ExUnit.Server.modules_loaded()
     assert capture_io(fn -> ExUnit.run() end) =~ "supervisor shutdown timed out after 500ms"
   end
 
@@ -140,8 +133,6 @@ defmodule ExUnit.CallbacksTest do
       defp error, do: :error
     end
 
-    ExUnit.Server.modules_loaded()
-
     assert capture_io(fn -> ExUnit.run() end) =~
              "** (MatchError) no match of right hand side value: :error"
   end
@@ -156,7 +147,6 @@ defmodule ExUnit.CallbacksTest do
       end
     end
 
-    ExUnit.Server.modules_loaded()
     assert capture_io(fn -> ExUnit.run() end) =~ ">) killed"
   end
 
@@ -199,7 +189,6 @@ defmodule ExUnit.CallbacksTest do
       end
     end
 
-    ExUnit.Server.modules_loaded()
     output = capture_io(fn -> ExUnit.run() end)
     assert output =~ "on_exit run"
     assert output =~ "1 test, 0 failures"
@@ -251,7 +240,6 @@ defmodule ExUnit.CallbacksTest do
     end
 
     no_formatters!()
-    ExUnit.Server.modules_loaded()
     output = capture_io(fn -> ExUnit.run() end)
 
     assert output =~ """
@@ -295,7 +283,6 @@ defmodule ExUnit.CallbacksTest do
     end
 
     no_formatters!()
-    ExUnit.Server.modules_loaded()
     output = capture_io(fn -> ExUnit.run() end)
 
     assert output =~ """
@@ -318,8 +305,6 @@ defmodule ExUnit.CallbacksTest do
       end
     end
 
-    ExUnit.Server.modules_loaded()
-
     assert capture_io(fn -> ExUnit.run() end) =~
              "** (RuntimeError) expected ExUnit callback in " <>
                "ExUnit.CallbacksTest.SetupErrorTest to return " <>
@@ -339,8 +324,6 @@ defmodule ExUnit.CallbacksTest do
       end
     end
 
-    ExUnit.Server.modules_loaded()
-
     assert capture_io(fn -> ExUnit.run() end) =~
              "** (RuntimeError) ExUnit callback in " <>
                "ExUnit.CallbacksTest.SetupReservedTest is " <>

lib/ex_unit/test/ex_unit/doc_test_test.exs

@@ -477,7 +477,6 @@ defmodule ExUnit.DocTestTest do
       doctest ExUnit.DocTestTest.SomewhatGoodModuleWithOnly, only: [one: 0, two: 0], import: true
     end
 
-    ExUnit.Server.modules_loaded()
     assert capture_io(fn -> ExUnit.run() end) =~ "2 doctests, 1 failure"
   end
 
@@ -487,7 +486,6 @@ defmodule ExUnit.DocTestTest do
       doctest ExUnit.DocTestTest.SomewhatGoodModuleWithOnly, only: [], import: true
     end
 
-    ExUnit.Server.modules_loaded()
     output = capture_io(fn -> ExUnit.run() end)
 
     assert output =~ "0 failures"
@@ -500,7 +498,6 @@ defmodule ExUnit.DocTestTest do
       doctest ExUnit.DocTestTest.SomewhatGoodModuleWithOnly, tags: [skip: true], import: true
     end
 
-    ExUnit.Server.modules_loaded()
     output = capture_io(fn -> ExUnit.run() end)
 
     assert output =~ "0 failures"
@@ -519,7 +516,6 @@ defmodule ExUnit.DocTestTest do
     doctest_line = __ENV__.line - 3
 
     ExUnit.configure(seed: 0, colors: [enabled: false])
-    ExUnit.Server.modules_loaded()
     output = capture_io(fn -> ExUnit.run() end)
 
     assert output =~ """
@@ -716,7 +712,6 @@ defmodule ExUnit.DocTestTest do
     starting_line = ExUnit.DocTestTest.PatternMatching.starting_line() + 18
 
     ExUnit.configure(seed: 0, colors: [enabled: false])
-    ExUnit.Server.modules_loaded()
     output = capture_io(fn -> ExUnit.run() end)
 
     assert output =~ """
@@ -818,7 +813,6 @@ defmodule ExUnit.DocTestTest do
       doctest ExUnit.DocTestTest.Numbered
     end
 
-    ExUnit.Server.modules_loaded()
     assert capture_io(fn -> ExUnit.run() end) =~ "1 doctest, 0 failures"
   end
 
@@ -847,7 +841,6 @@ defmodule ExUnit.DocTestTest do
       end
     end
 
-    ExUnit.Server.modules_loaded()
     assert capture_io(fn -> ExUnit.run() end) =~ "2 doctests, 0 failures"
   end
 

lib/ex_unit/test/ex_unit/register_test.exs

@@ -28,8 +28,6 @@ defmodule ExUnit.RegisterTest do
       defp succeed, do: true
     end
 
-    ExUnit.Server.modules_loaded()
-
     assert capture_io(fn ->
              assert ExUnit.run() == %{failures: 0, skipped: 0, total: 2, excluded: 0}
            end) =~ "1 property, 1 test, 0 failures"
@@ -68,8 +66,6 @@ defmodule ExUnit.RegisterTest do
       defp succeed, do: true
     end
 
-    ExUnit.Server.modules_loaded()
-
     assert capture_io(fn ->
              assert ExUnit.run() == %{failures: 0, skipped: 0, total: 4, excluded: 0}
            end) =~ "2 properties, 2 tests, 0 failures"