From da468db64868a61f2a1b33d6611ac9c85ed76664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mickae=CC=88l=20Re=CC=81mond?= Date: Sat, 7 Mar 2015 11:49:37 +0100 Subject: [PATCH] Fix Elixir tests failure detection We now make sure we have no failure. Solves #438 --- test/ejabberd_SUITE.erl | 2 +- test/elixir_SUITE.erl | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl index a2fa16483..9ab9c247e 100644 --- a/test/ejabberd_SUITE.erl +++ b/test/ejabberd_SUITE.erl @@ -1,6 +1,6 @@ %%%------------------------------------------------------------------- %%% @author Evgeniy Khramtsov -%%% @copyright (C) 2013, Evgeniy Khramtsov +%%% @copyright (C) 2002-2015, ProcessOne %%% @doc %%% %%% @end diff --git a/test/elixir_SUITE.erl b/test/elixir_SUITE.erl index ec5dc5ec6..64480aef5 100644 --- a/test/elixir_SUITE.erl +++ b/test/elixir_SUITE.erl @@ -42,16 +42,19 @@ is_elixir_available() -> undefined_function(?MODULE, Func, Args) -> case lists:suffix(".exs", atom_to_list(Func)) of - true -> - 'Elixir.ExUnit':start([]), - 'Elixir.Code':load_file(list_to_binary(filename:join(test_dir(), atom_to_list(Func)))), - 'Elixir.ExUnit':run(); + true -> + run_elixir_test(Func); false -> error_handler:undefined_function(?MODULE, Func, Args) end; undefined_function(Module, Func, Args) -> error_handler:undefined_function(Module, Func,Args). +run_elixir_test(Func) -> + 'Elixir.ExUnit':start([]), + 'Elixir.Code':load_file(list_to_binary(filename:join(test_dir(), atom_to_list(Func)))), + #{failures := 0} = 'Elixir.ExUnit':run(). + test_dir() -> {ok, CWD} = file:get_cwd(), filename:join(CWD, "../../test").