From 71a856deaafa5dcb706c70b414f9a2219cdec855 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Chmielowski?= Date: Fri, 16 Feb 2018 16:49:39 +0100 Subject: [PATCH] Handle gracefully that mnesia is already loaded when starting tests --- test/suite.erl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/suite.erl b/test/suite.erl index b91583d18..960cbdc90 100644 --- a/test/suite.erl +++ b/test/suite.erl @@ -89,8 +89,14 @@ init_config(Config) -> ConfigPath = filename:join([CWD, "ejabberd.yml"]), ok = file:write_file(ConfigPath, CfgContent2), setup_ejabberd_lib_path(Config), - ok = application:load(sasl), - ok = application:load(mnesia), + case application:load(sasl) of + ok -> ok; + {error, {already_loaded, _}} -> ok + end, + case application:load(mnesia) of + ok -> ok; + {error, {already_loaded, _}} -> ok + end, case application:load(ejabberd) of ok -> ok; {error, {already_loaded, _}} -> ok -- 2.40.0