Update CHANGELOG and verbage from previous pull request

Author: José Valim

CHANGELOG.md

@@ -16,6 +16,7 @@
 
 * bug fix
   * [ExUnit] Handle exit messages from in ExUnit
+  * [ExUnit] Failures on ExUnit's setup_all now invalidates all tests
   * [Kernel] Ensure we don't splice keyword args unecessarily
   * [Kernel] Private functions used by private macros no longer emit an unused warning 
   * [Kernel] Ensure Elixir won't trip on empty receive blocks

lib/ex_unit/lib/ex_unit/callbacks.ex

@@ -127,7 +127,7 @@ defmodule ExUnit.Callbacks do
   ## Helpers
 
   def __merge__(_mod, other, :ok), do: other
-  def __merge__(_mod, other, { :ok, data }), do: Keyword.merge(other, data)
+  def __merge__(_mod, other, { :ok, data }) when is_list(data), do: Keyword.merge(other, data)
   def __merge__(mod, _, failure) do
     raise "expected ExUnit callback in #{inspect mod} to return :ok " <>
           " or { :ok, data }, got #{inspect failure} instead"

lib/ex_unit/lib/ex_unit/cli_formatter.ex

@@ -53,7 +53,7 @@ defmodule ExUnit.CLIFormatter do
     super
   end
 
-  def handle_cast({ :test_finished, test = ExUnit.Test[failure: nil, invalid: true] }, config) do
+  def handle_cast({ :test_finished, test = ExUnit.Test[invalid: true] }, config) do
     IO.write invalid("?")
     { :noreply, config.update_counter(&1 + 1).
         update_test_failures([test|&1]) }
@@ -119,7 +119,7 @@ defmodule ExUnit.CLIFormatter do
   end
 
   defp print_case_failure(ExUnit.TestCase[name: case_name, failure: { kind, reason, stacktrace }], acc, cwd) do
-    IO.puts "  #{acc}) #{inspect case_name}"
+    IO.puts "  #{acc}) #{inspect case_name}: failure on setup_all/teardown_all callback, tests invalidated."
     print_kind_reason(kind, reason)
     print_stacktrace(stacktrace, case_name, nil, cwd)
     IO.write "\n"

lib/ex_unit/lib/ex_unit/runner.ex

@@ -89,13 +89,14 @@ defmodule ExUnit.Runner do
       end
 
       tests = tests_for(case_name)
+
       if test_case.failure do
         Enum.each tests, fn test_name ->
           test = ExUnit.Test[name: test_name, case: test_case, invalid: true]
           pid <- { self, :test_finished, test }
         end
-        self_pid <- { self, :case_finished, test_case }
 
+        self_pid <- { self, :case_finished, test_case }
       else
         Enum.each tests, run_test(config, pid, test_case, &1, context)