Update to DynamicSupervisor

Author: skosch

lib/mailman/test_server.ex

@@ -1,7 +1,11 @@
 defmodule Mailman.TestServer do
-  @moduledoc "Implementation of the testing SMTP server"
+  @moduledoc """
+  Implementation of the testing SMTP server.
+  The GenServer state is just a single list of "deliveries" that can be pushed to,
+  cleared, and queried.
+  """
 
-  use GenServer
+  use GenServer, restart: :transient
   require Logger
 
   @doc """
@@ -29,7 +33,7 @@ defmodule Mailman.TestServer do
     Mailman.TestServerSupervisor.start_link
   end
 
-  def start_link(initial_state, parent_pid) do
+  def start_link({initial_state, parent_pid}) do
     GenServer.start_link(__MODULE__, {initial_state, parent_pid}, [])
   end
 

lib/mailman/test_server_supervisor.ex

@@ -1,21 +1,18 @@
 defmodule Mailman.TestServerSupervisor do
-  @moduledoc "Starts a test server"
-  use Supervisor
+  @moduledoc "A DynamicSupervisor to manage TestServers, which can get started ad-hoc"
+  use DynamicSupervisor
 
-  def start_link do
+  def start_link() do
     :ets.new(:mailman_test_servers, [:set, :public, :named_table])
-    Supervisor.start_link(__MODULE__, [], name: __MODULE__)
+    DynamicSupervisor.start_link(__MODULE__, [], name: __MODULE__)
   end
 
-  def start_test_server(parent_pid) do
-    Supervisor.start_child(__MODULE__, [parent_pid])
+  def init(_arg) do
+    DynamicSupervisor.init(strategy: :one_for_one)
   end
 
-  def init([]) do
-    children = [
-      worker(Mailman.TestServer, [[]], restart: :transient)
-    ]
-
-    supervise(children, strategy: :simple_one_for_one)
+  def start_test_server(parent_pid) do
+    child_spec = {Mailman.TestServer, {[], parent_pid}}
+    DynamicSupervisor.start_child(__MODULE__, child_spec)
   end
 end

test/mailman_test.exs

@@ -90,10 +90,10 @@ defmodule MailmanTest do
   end
 
   test "parsing sent emails works" do
-    {:ok, message} = MyApp.Mailer.deliver(testing_email())
-    {:ok, parsed_email} = Mailman.Email.parse(message)
-
     # Un-comment this to investigate problems with parsing
+    #
+    # {:ok, message} = MyApp.Mailer.deliver(testing_email())
+    # {:ok, parsed_email} = Mailman.Email.parse(message)
     # IO.inspect(parsed_email)
 
     assert true
@@ -175,7 +175,7 @@ defmodule MailmanTest do
       ])
 
     # Just check whether it contains it for now
-    rendered_email =~ "X-Test-Header: 123"
+    assert rendered_email =~ "X-Test-Header: 123"
   end
 
   def assert_same_attachments(email1, email2) do
@@ -352,12 +352,11 @@ defmodule MailmanTest do
   end
 
   test "should encode email parts properly" do
-    email_with_unicode_in_header = email_with_unicode_in_header()
-
-    rendered_email =
-      Mailman.Render.render(email_with_unicode_in_header, %Mailman.EexComposeConfig{})
-
     # Un-comment this to investigate problems with header encodings
+    #
+    # email_with_unicode_in_header = email_with_unicode_in_header()
+    # rendered_email =
+    #   Mailman.Render.render(email_with_unicode_in_header, %Mailman.EexComposeConfig{})
     # IO.inspect(rendered_email)
 
     assert true