From: Paweł Chmielowski <pchmielowski@process-one.net>
Date: Fri, 16 Feb 2018 15:49:39 +0000 (+0100)
Subject: Handle gracefully that mnesia is already loaded when starting tests
X-Git-Tag: 18.03~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71a856deaafa5dcb706c70b414f9a2219cdec855;p=ejabberd

Handle gracefully that mnesia is already loaded when starting tests
---

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