Remove warnings from the test suite

José Valim · José Valim · commit 284e75d031a6 · 2014-07-31T10:46:29.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,14 +17,16 @@
   * [Kernel] Ensure private functions are not exported
   * [Protocol] Do not expose protocol convention on `assert_impl!/2`
   * [Regex] Do not consider subpatterns on `Regex.split/3`
-  * [Stream] Implement the Inspect protocol for Streams so we do not leak the Stream representation
+  * [Stream] Implement the `Inspect` protocol for Streams so we do not leak the Stream representation
 
 * Deprecations
+  * [IEx] IEx color configuration expects a list of atoms instead of a string with colors separated by comma
   * [Inspect] `Inspect.Algebra.pretty/2` is deprecated in favor of `Inspect.Algebra.format/2` that instead returns iodata. This function was used only by documentation examples and it is unlikely to affect actual code
   * [IO] `IO.ANSI.escape/2` and `IO.ANSI.escape_fragment/2` is deprecated in favor of `IO.ANSI.format/2` and `IO.ANSI.format_fragment/2`
   * [Kernel] Leading `0` for octals is deprecated in favor of `0o`
   * [Kernel] `0X` for hexadecimals is deprecated in favor of `0x`
   * [Kernel] `0B` for binaries is deprecated in favor of `0b`
+  * [Mix] Mix color configuration expects a list of atoms instead of a string with colors separated by comma
   * [String] `\NNN`, `\NN` and `\N` for octals are deprecated inside string, sigils and chars in favor of hexadecimal entries with `\x`
 
 * Backwards incompatible changes
diff --git a/lib/elixir/lib/io/ansi.ex b/lib/elixir/lib/io/ansi.ex
@@ -28,6 +28,10 @@ defmodule IO.ANSI do
 
   import IO.ANSI.Sequence
 
+  @typep ansicode :: atom()
+  @typep ansilist :: maybe_improper_list(char() | ansicode() | binary() | ansilist(), binary() | ansicode() | [])
+  @type  ansidata :: ansilist() | ansicode() | binary()
+
   @doc """
   Checks whether the default I/O device is a terminal or a file.
 
@@ -159,7 +163,7 @@ defmodule IO.ANSI do
   ## Examples
 
       iex> IO.ANSI.format(["Hello, ", :red, :bright, "world!"], true)
-      [[[[[[], "Hello, "], "\e[31m"], "\e[1m"], "world!"] | "\e[0m"]
+      [[[[[[], "Hello, "] | "\e[31m"] | "\e[1m"], "world!"] | "\e[0m"]
 
   """
   def format(chardata, emit \\ terminal?) when is_boolean(emit) do
@@ -180,7 +184,7 @@ defmodule IO.ANSI do
   ## Examples
 
       iex> IO.ANSI.format_fragment([:bright, 'Word'], true)
-      [[[[[[], "\e[1m"], 87], 111], 114], 100]
+      [[[[[[] | "\e[1m"], 87], 111], 114], 100]
 
   """
   def format_fragment(chardata, emit \\ terminal?) when is_boolean(emit) do
diff --git a/lib/elixir/lib/io/ansi/docs.ex b/lib/elixir/lib/io/ansi/docs.ex
@@ -21,13 +21,12 @@ defmodule IO.ANSI.Docs do
   comma-separated ANSI values.
   """
   def default_options do
-    [enabled: true,
-     doc_code: "cyan,bright",
-     doc_inline_code: "cyan",
-     doc_headings: "yellow,bright",
-     doc_title: "reverse,yellow,bright",
-     doc_bold: "bright",
-     doc_underline: "underline",
+    [doc_code: [:cyan, :bright],
+     doc_inline_code: [:cyan],
+     doc_headings: [:yellow, :bright],
+     doc_title: [:reverse, :yellow, :bright],
+     doc_bold: [:bright],
+     doc_underline: [:underline],
      width: 80]
   end
 
@@ -224,7 +223,7 @@ defmodule IO.ANSI.Docs do
   ## Helpers
 
   defp write(style, string, options) do
-    IO.puts color(style, options) <> string <> IO.ANSI.reset
+    IO.puts [color(style, options), string, IO.ANSI.reset]
     IO.puts IO.ANSI.reset
   end
 
@@ -370,7 +369,11 @@ defmodule IO.ANSI.Docs do
 
   defp color(style, colors) do
     color = colors[style]
-    enabled = colors[:enabled]
-    IO.ANSI.escape_fragment("%{#{color}}", enabled)
+    if is_binary(color) do
+      IO.puts :stderr, "warning: ANSI colors as strings is deprecated, " <>
+                       "they now must be a list of atoms, got #{inspect color} for #{inspect style}"
+      color = String.split(color, ",") |> Enum.map(&String.to_atom/1)
+    end
+    IO.ANSI.format_fragment(color, true)
   end
 end
diff --git a/lib/elixir/test/elixir/gen_event_test.exs b/lib/elixir/test/elixir/gen_event_test.exs
@@ -88,7 +88,7 @@ defmodule GenEventTest do
   end
 
   test "bad calls" do
-    :error_logger.tty(false)
+    Logger.remove_backend(:console)
     {:ok, pid} = GenEvent.start_link()
     assert GenEvent.add_handler(pid, LoggerHandler, []) == :ok
     assert GenEvent.call(pid, UnknownHandler, :messages) ==
@@ -98,7 +98,8 @@ defmodule GenEventTest do
     assert GenEvent.which_handlers(pid) == []
     assert GenEvent.stop(pid) == :ok
   after
-    :error_logger.tty(true)
+    :gen_event.which_handlers(:error_logger)
+    Logger.add_backend(:console)
   end
 
   test "sync stream/2" do
diff --git a/lib/elixir/test/elixir/task/supervisor_test.exs b/lib/elixir/test/elixir/task/supervisor_test.exs
@@ -9,8 +9,11 @@ defmodule Task.SupervisorTest do
   end
 
   setup do
-    :error_logger.tty(false)
-    on_exit fn -> :error_logger.tty(true) end
+    Logger.remove_backend(:console)
+    on_exit fn ->
+      :gen_event.which_handlers(:error_logger)
+      Logger.add_backend(:console)
+    end
     :ok
   end
 
diff --git a/lib/elixir/test/elixir/task_test.exs b/lib/elixir/test/elixir/task_test.exs
@@ -4,8 +4,11 @@ defmodule TaskTest do
   use ExUnit.Case, async: true
 
   setup do
-    :error_logger.tty(false)
-    on_exit fn -> :error_logger.tty(true) end
+    Logger.remove_backend(:console)
+    on_exit fn ->
+      :gen_event.which_handlers(:error_logger)
+      Logger.add_backend(:console)
+    end
     :ok
   end
 
diff --git a/lib/ex_unit/lib/ex_unit/cli_formatter.ex b/lib/ex_unit/lib/ex_unit/cli_formatter.ex
@@ -167,26 +167,26 @@ defmodule ExUnit.CLIFormatter do
   # Color styles
 
   defp colorize(escape, string, %{color: color}) do
-    IO.ANSI.escape_fragment("%{#{escape}}", color)
-      <> string
-      <> IO.ANSI.escape_fragment("%{reset}", color)
+    [IO.ANSI.format_fragment(escape, color),
+     string,
+     IO.ANSI.format_fragment(:reset, color)] |> IO.iodata_to_binary
   end
 
   defp success(msg, config) do
-    colorize("green", msg, config)
+    colorize([:green], msg, config)
   end
 
   defp invalid(msg, config) do
-    colorize("yellow", msg, config)
+    colorize([:yellow], msg, config)
   end
 
   defp failure(msg, config) do
-    colorize("red", msg, config)
+    colorize([:red], msg, config)
   end
 
-  defp formatter(:error_info, msg, config),    do: colorize("red", msg, config)
-  defp formatter(:extra_info, msg, config),    do: colorize("cyan", msg, config)
-  defp formatter(:location_info, msg, config), do: colorize("bright,black", msg, config)
+  defp formatter(:error_info, msg, config),    do: colorize([:red], msg, config)
+  defp formatter(:extra_info, msg, config),    do: colorize([:cyan], msg, config)
+  defp formatter(:location_info, msg, config), do: colorize([:bright, :black], msg, config)
   defp formatter(_,  msg, _config),            do: msg
 
   defp get_terminal_width do
diff --git a/lib/iex/lib/iex.ex b/lib/iex/lib/iex.ex
@@ -333,8 +333,14 @@ defmodule IEx do
 
     if colors[:enabled] do
       ansi = Keyword.get(colors, color, default_color(color))
-      IO.ANSI.escape_fragment("%{#{ansi}}", true) <> string <>
-        IO.ANSI.escape_fragment("%{reset}", true)
+
+      if is_binary(ansi) do
+        IO.puts :stderr, "warning: ANSI colors as strings is deprecated, " <>
+                         "they now must be a list of atoms, got #{inspect ansi} for #{inspect color}"
+        ansi = String.split(ansi, ",") |> Enum.map(&String.to_atom/1)
+      end
+
+      IO.iodata_to_binary(IO.ANSI.format_fragment(ansi, true)) <> string <> IO.ANSI.reset
     else
       string
     end
@@ -507,22 +513,22 @@ defmodule IEx do
   end
 
   # Used by default on evaluation cycle
-  defp default_color(:eval_interrupt), do: "yellow"
-  defp default_color(:eval_result), do: "yellow"
-  defp default_color(:eval_error), do: "red"
-  defp default_color(:eval_info), do: "normal"
-  defp default_color(:stack_app), do: "red,bright"
-  defp default_color(:stack_info), do: "red"
+  defp default_color(:eval_interrupt), do: [:yellow]
+  defp default_color(:eval_result), do: [:yellow]
+  defp default_color(:eval_error), do: [:red]
+  defp default_color(:eval_info), do: [:normal]
+  defp default_color(:stack_app), do: [:red, :bright]
+  defp default_color(:stack_info), do: [:red]
 
   # Used by ls
-  defp default_color(:ls_directory), do: "blue"
-  defp default_color(:ls_device), do: "green"
+  defp default_color(:ls_directory), do: [:blue]
+  defp default_color(:ls_device), do: [:green]
 
   # Used by ansi docs
-  defp default_color(:doc_bold), do: "bright"
-  defp default_color(:doc_code), do: "cyan,bright"
-  defp default_color(:doc_headings), do: "yellow,bright"
-  defp default_color(:doc_inline_code), do: "cyan"
-  defp default_color(:doc_underline), do: "underline"
-  defp default_color(:doc_title), do: "reverse,yellow,bright"
+  defp default_color(:doc_bold), do: [:bright]
+  defp default_color(:doc_code), do: [:cyan, :bright]
+  defp default_color(:doc_headings), do: [:yellow, :bright]
+  defp default_color(:doc_inline_code), do: [:cyan]
+  defp default_color(:doc_underline), do: [:underline]
+  defp default_color(:doc_title), do: [:reverse, :yellow, :bright]
 end
diff --git a/lib/iex/test/iex/interaction_test.exs b/lib/iex/test/iex/interaction_test.exs
@@ -94,16 +94,10 @@ defmodule IEx.InteractionTest do
 
   unless match?({:win32,_}, :os.type) do
     test "color" do
-      opts = [colors: [enabled: true, eval_result: "red"]]
+      opts = [colors: [enabled: true, eval_result: [:red]]]
       assert capture_iex("1 + 2", opts) == "\e[31m3\e[0m"
-
-      # Sanity checks
-      assert capture_iex("IO.ANSI.escape(\"%{blue}hello\", true)", opts)
-             == "\e[31m\"\\e[34mhello\\e[0m\"\e[0m"
-      assert capture_iex("IO.puts IO.ANSI.escape(\"%{blue}hello\", true)", opts)
-             == "\e[34mhello\e[0m\n\e[31m:ok\e[0m"
-      assert capture_iex("IO.puts IO.ANSI.escape(\"%{blue}hello\", true)", [colors: [enabled: false]])
-             == "\e[34mhello\e[0m\n:ok"
+      assert capture_iex("IO.ANSI.blue", opts)
+             == "\e[31m\"\\e[34m\"\e[0m"
     end
   end
 
diff --git a/lib/logger/lib/logger/watcher.ex b/lib/logger/lib/logger/watcher.ex
@@ -25,10 +25,7 @@ defmodule Logger.Watcher do
   Removes the given handler.
   """
   def unwatch(mod, handler) do
-    case Supervisor.terminate_child(@name, {mod, handler}) do
-      :ok -> Supervisor.delete_child(@name, {mod, handler})
-      res -> res
-    end
+    GenEvent.remove_handler(mod, handler, :ok)
   end
 
   @doc """
@@ -63,7 +60,7 @@ defmodule Logger.Watcher do
   ## Callbacks
 
   def init({mod, handler, args}) do
-    case :gen_event.add_sup_handler(mod, handler, args) do
+    case GenEvent.add_handler(mod, handler, args, link: true) do
       :ok               -> {:ok, {mod, handler}}
       {:error, :ignore} -> :ignore
       {:error, reason}  -> {:stop, reason}
diff --git a/lib/logger/test/logger/error_handler_test.exs b/lib/logger/test/logger/error_handler_test.exs
@@ -10,6 +10,13 @@ defmodule Logger.ErrorHandlerTest do
     assert error_log(:info_msg, "~p~n", [:hello]) =~ msg("[info] :hello\n")
   end
 
+  test "survives after Logger exit" do
+    Process.whereis(Logger) |> Process.exit(:kill)
+    wait_for_logger()
+    wait_for_handler(:error_logger, Logger.ErrorHandler)
+    assert error_log(:info_msg, "~p~n", [:hello]) =~ msg("[info] :hello\n")
+  end
+
   test "formats error_logger info message" do
     assert error_log(:info_msg, "hello", []) =~ msg("[info] hello")
     assert error_log(:info_msg, "~p~n", [:hello]) =~ msg("[info] :hello\n")
diff --git a/lib/logger/test/logger_test.exs b/lib/logger/test/logger_test.exs
@@ -33,7 +33,7 @@ defmodule LoggerTest do
   test "add_backend/1 and remove_backend/1" do
     assert :ok = Logger.remove_backend(:console)
     assert Logger.remove_backend(:console) ==
-           {:error, :not_found}
+           {:error, :module_not_found}
 
     assert capture_log(fn ->
       assert Logger.debug("hello", []) == :ok
@@ -154,10 +154,10 @@ defmodule LoggerTest do
   end
 
   test "Logger.Config survives Logger exit" do
-    Process.whereis(Logger)
-      |> Process.exit(:kill)
+    Process.whereis(Logger) |> Process.exit(:kill)
     wait_for_logger()
     wait_for_handler(Logger, Logger.Config)
+    wait_for_handler(:error_logger, Logger.ErrorHandler)
   end
 
   test "Logger.Config can restart the application" do
@@ -171,5 +171,8 @@ defmodule LoggerTest do
     assert {:ok, pid} = Logger.add_backend(:console)
     assert Logger.add_backend(:console) ==
            {:error, {:already_started, pid}}
+  after
+    Application.put_env(:logger, :backends, [:console])
+    Logger.Config.restart()
   end
 end
diff --git a/lib/logger/test/test_helper.exs b/lib/logger/test/test_helper.exs
@@ -1,4 +1,4 @@
-ExUnit.start seed: 362385, trace: true
+ExUnit.start()
 
 defmodule Logger.Case do
   use ExUnit.CaseTemplate
diff --git a/lib/mix/lib/mix/generator.ex b/lib/mix/lib/mix/generator.ex
@@ -11,8 +11,7 @@ defmodule Mix.Generator do
   If the file already exists, asks for user confirmation.
   """
   def create_file(path, contents) when is_binary(path) do
-    Mix.shell.info "%{green}* creating%{reset} #{Path.relative_to_cwd path}",
-                   ansi: true
+    Mix.shell.info [:green, "* creating ", :reset, Path.relative_to_cwd(path)]
 
     if overwriting?(path) do
       File.mkdir_p!(Path.dirname(path))
@@ -24,9 +23,7 @@ defmodule Mix.Generator do
   Creates a directory if one does not exist yet.
   """
   def create_directory(path) when is_binary(path) do
-    Mix.shell.info "%{green}* creating%{reset} #{Path.relative_to_cwd path}",
-                   ansi: true
-
+    Mix.shell.info [:green, "* creating ", :reset, Path.relative_to_cwd(path)]
     File.mkdir_p! path
   end
 
diff --git a/lib/mix/lib/mix/shell.ex b/lib/mix/lib/mix/shell.ex
@@ -7,18 +7,13 @@ defmodule Mix.Shell do
 
   @doc """
   Informs the given message.
-
-  ## Options
-
-    * `:ansi` - If `true` message will be ANSI escaped
   """
-  defcallback info(message :: String.t) :: any
-  defcallback info(message :: String.t, opts :: Keyword.t) :: any
+  defcallback info(message :: IO.ANSI.ansidata) :: any
 
   @doc """
   Warns about the given error message.
   """
-  defcallback error(message :: String.t) :: any
+  defcallback error(message :: IO.ANSI.ansidata) :: any
 
   @doc """
   Prompts the user for input.
diff --git a/lib/mix/lib/mix/shell/io.ex b/lib/mix/lib/mix/shell/io.ex
diff --git a/lib/mix/lib/mix/shell/process.ex b/lib/mix/lib/mix/shell/process.ex
diff --git a/lib/mix/lib/mix/tasks/escript.build.ex b/lib/mix/lib/mix/tasks/escript.build.ex
diff --git a/lib/mix/test/mix/cli_test.exs b/lib/mix/test/mix/cli_test.exs
diff --git a/lib/mix/test/mix/shell_test.exs b/lib/mix/test/mix/shell_test.exs
diff --git a/lib/mix/test/mix/tasks/app.start_test.exs b/lib/mix/test/mix/tasks/app.start_test.exs
