From b1216cf39c987a65f5545f8d9034a1c37f1654cf Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Mon, 17 Sep 2018 15:42:52 +0200
Subject: [logger] Skip app level test if app cannot be loaded

---
 lib/kernel/test/logger_SUITE.erl | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/kernel/test/logger_SUITE.erl b/lib/kernel/test/logger_SUITE.erl
index 6bd9b20c35..aef3047856 100644
--- a/lib/kernel/test/logger_SUITE.erl
+++ b/lib/kernel/test/logger_SUITE.erl
@@ -429,27 +429,32 @@ set_application_level(_Config) ->
     {error,{not_loaded,mnesia}} = logger:set_application_level(mnesia, warning),
     {error,{not_loaded,mnesia}} = logger:unset_application_level(mnesia),
 
-    application:load(mnesia),
-    {ok, Modules} = application:get_key(mnesia, modules),
-    [] = logger:get_module_level(Modules),
+    case application:load(mnesia) of
+        ok ->
+            {ok, Modules} = application:get_key(mnesia, modules),
+            [] = logger:get_module_level(Modules),
 
-    {error,{invalid_level,warn}} = logger:set_application_level(mnesia, warn),
+            {error,{invalid_level,warn}} =
+                logger:set_application_level(mnesia, warn),
 
-    ok = logger:set_application_level(mnesia, debug),
-    DebugModules = lists:sort([{M,debug} || M <- Modules]),
-    DebugModules = lists:sort(logger:get_module_level(Modules)),
+            ok = logger:set_application_level(mnesia, debug),
+            DebugModules = lists:sort([{M,debug} || M <- Modules]),
+            DebugModules = lists:sort(logger:get_module_level(Modules)),
 
-    ok = logger:set_application_level(mnesia, warning),
+            ok = logger:set_application_level(mnesia, warning),
 
-    WarnModules = lists:sort([{M,warning} || M <- Modules]),
-    WarnModules = lists:sort(logger:get_module_level(Modules)),
+            WarnModules = lists:sort([{M,warning} || M <- Modules]),
+            WarnModules = lists:sort(logger:get_module_level(Modules)),
 
-    ok = logger:unset_application_level(mnesia),
-    [] = logger:get_module_level(Modules).
+            ok = logger:unset_application_level(mnesia),
+            [] = logger:get_module_level(Modules);
+        {error,{"no such file or directory","mnesia.app"}} ->
+            {skip, "Cannot load mnesia, does not exist"}
+    end.
 
 set_application_level(cleanup,_Config) ->
-    ok = logger:unset_application_level(mnesia),
-    ok = application:unload(mnesia),
+    _ = logger:unset_application_level(mnesia),
+    _ = application:unload(mnesia),
     ok.
 
 cache_module_level(_Config) ->
-- 
cgit v1.2.3