Remove deprecated on_exit callbacks

Author: José Valim

lib/elixir/test/elixir/gen_event_test.exs

@@ -30,11 +30,6 @@ defmodule GenEventTest do
 
   @receive_timeout 1000
 
-  teardown _ do
-    Process.flag(:trap_exit, false)
-    :ok
-  end
-
   test "start_link/2 and handler workflow" do
     {:ok, pid} = GenEvent.start_link()
 

lib/elixir/test/elixir/kernel/lexical_tracker_test.exs

@@ -9,11 +9,6 @@ defmodule Kernel.LexicalTrackerTest do
     {:ok, [pid: D.start_link]}
   end
 
-  teardown config do
-    D.stop(config[:pid])
-    :ok
-  end
-
   test "can add remote dispatches", config do
     D.remote_dispatch(config[:pid], String)
     assert D.remotes(config[:pid]) == [String]

lib/elixir/test/elixir/module/locals_tracker_test.exs

@@ -9,11 +9,6 @@ defmodule Module.LocalsTrackerTest do
     {:ok, [pid: D.start_link]}
   end
 
-  teardown config do
-    D.stop(config[:pid])
-    :ok
-  end
-
   ## Locals
 
   test "can add definitions", config do

lib/ex_unit/lib/ex_unit/case.ex

@@ -73,17 +73,10 @@ defmodule ExUnit.Case do
           if cd = context[:cd] do
             prev_cd = File.cwd!
             File.cd!(cd)
-            {:ok, [prev_cd: prev_cd]}
-          else
-            :ok
+            on_exit fn -> File.cd!(prev_cd) end
           end
-        end
 
-        teardown context do
-          # Revert to the previous working directory
-          if cd = context[:prev_cd] do
-            File.cd!(cd)
-          end
+          :ok
         end
 
         @tag cd: "fixtures"
@@ -93,10 +86,8 @@ defmodule ExUnit.Case do
       end
 
   In the example above, we have defined a tag called `:cd` that is
-  read in the setup callback to configure the working directory the test is
-  going to run on. We then use the same context to store the
-  previous working directory that is reverted to after the test
-  in the teardown callback.
+  read in the setup callback to configure the working directory the
+  test is going to run on.
 
   Tags are also very effective when used with case templates
   (`ExUnit.CaseTemplate`) allowing callbacks in the case template

lib/ex_unit/lib/ex_unit/formatter.ex

@@ -214,7 +214,7 @@ defmodule ExUnit.Formatter do
   defp with_counter(counter, msg) when counter < 100 do  " #{counter}) #{msg}" end
   defp with_counter(counter, msg)                    do   "#{counter}) #{msg}" end
 
-  defp test_case_info(msg, nil),       do: msg <> "failure on setup_all/teardown_all callback, tests invalidated\n"
+  defp test_case_info(msg, nil),       do: msg <> "failure on setup_all callback, tests invalidated\n"
   defp test_case_info(msg, formatter), do: test_case_info(formatter.(:test_case_info, msg), nil)
 
   defp test_info(msg, nil),       do: msg <> "\n"

lib/ex_unit/test/ex_unit/formatter_test.exs

@@ -103,15 +103,15 @@ defmodule ExUnit.FormatterTest do
   test "formats test case errors" do
     failure = {:error, catch_error(raise "oops"), []}
     assert format_test_case_failure(case(), failure, 1, 80, &formatter/2) =~ """
-      1) Hello: failure on setup_all/teardown_all callback, tests invalidated
+      1) Hello: failure on setup_all callback, tests invalidated
          ** (RuntimeError) oops
     """
   end
 
   test "formats assertions with operators with no limit" do
     failure = {:error, catch_assertion(assert [1, 2, 3] == [4, 5, 6]), []}
     assert format_test_case_failure(case(), failure, 1, :infinity, &formatter/2) =~ """
-      1) Hello: failure on setup_all/teardown_all callback, tests invalidated
+      1) Hello: failure on setup_all callback, tests invalidated
          Assertion with == failed
          code: [1, 2, 3] == [4, 5, 6]
          lhs:  [1, 2, 3]
@@ -122,7 +122,7 @@ defmodule ExUnit.FormatterTest do
   test "formats assertions with operators with column limit" do
     failure = {:error, catch_assertion(assert [1, 2, 3] == [4, 5, 6]), []}
     assert format_test_case_failure(case(), failure, 1, 15, &formatter/2) =~ """
-      1) Hello: failure on setup_all/teardown_all callback, tests invalidated
+      1) Hello: failure on setup_all callback, tests invalidated
          Assertion with == failed
          code: [1, 2, 3] == [4, 5, 6]
          lhs:  [1,

lib/iex/test/test_helper.exs

@@ -34,11 +34,7 @@ defmodule IEx.Case do
   setup do
     opts = IEx.configuration |>
            Keyword.take([:default_prompt, :alive_prompt, :inspect, :colors, :history_size])
-    {:ok, [iex_opts: opts]}
-  end
-
-  teardown context do
-    IEx.configure context[:iex_opts]
+    on_exit fn -> IEx.configure(opts) end
     :ok
   end
 

lib/mix/test/mix/rebar_test.exs

@@ -19,11 +19,7 @@ defmodule Mix.RebarTest do
   setup do
     available = Mix.SCM.available
     Application.put_env(:mix, :scm, [Mix.SCM.Git, MyPath])
-    {:ok, [scm: available]}
-  end
-
-  teardown context do
-    Application.put_env(:mix, :scm, context[:scm])
+    on_exit fn -> Application.put_env(:mix, :scm, available) end
     :ok
   end
 

lib/mix/test/mix/scm_test.exs

@@ -4,11 +4,8 @@ defmodule Mix.SCMTest do
   use MixTest.Case
 
   setup do
-    {:ok, [scm: Mix.SCM.available]}
-  end
-
-  teardown context do
-    Application.put_env(:mix, :scm, context[:scm])
+    available = Mix.SCM.available
+    on_exit fn -> Application.put_env(:mix, :scm, available) end
     :ok
   end