Handle gracefully that mnesia is already loaded when starting tests

diff --git a/test/suite.erl b/test/suite.erl
index b91583d180d0895ba4a0c74f4161a97f989810f4..960cbdc908b7210d7278cc8e4ae5e8e10d15db51 100644 (file)
--- 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