From 967a7deaaee2782fb91c8af592096c6b39c666f8 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Tue, 23 May 2017 17:35:49 +0200
Subject: kernel: Make sure to cleanup after distr tests

Because this test suite did not cleanup after itself,
the error_logger_warn_SUITE:file_utc failed to start its node
that it needed for the test.
---
 lib/kernel/test/erl_distribution_SUITE.erl | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index d7a9ac39a3..bbfaa9d147 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -230,7 +230,7 @@ legal(Name) ->
     end.
 
 illegal(Name) ->
-    case test_node(Name) of
+    case test_node(Name, true) of
         not_started ->
             ok;
         started ->
@@ -238,12 +238,20 @@ illegal(Name) ->
     end.
 
 test_node(Name) ->
+    test_node(Name, false).
+test_node(Name, Illigal) ->
     ProgName = atom_to_list(lib:progname()),
     Command = ProgName ++ " -noinput " ++ long_or_short() ++ Name ++
-               " -eval \"net_adm:ping('" ++ atom_to_list(node()) ++ "')\"",
+        " -eval \"net_adm:ping('" ++ atom_to_list(node()) ++ "')\"" ++
+        case Illigal of
+            true ->
+                " -eval \"timer:sleep(10000),init:stop().\"";
+            false ->
+                ""
+        end,
     net_kernel:monitor_nodes(true),
     BinCommand = unicode:characters_to_binary(Command, utf8),
-    open_port({spawn, BinCommand}, [stream]),
+    Prt = open_port({spawn, BinCommand}, [stream]),
     Node = list_to_atom(Name),
     receive
         {nodeup, Node} ->
-- 
cgit v1.2.3


From 7ba1983bb5b5cd0d391a5ba944d1fd28ae4187d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 24 May 2017 10:43:35 +0200
Subject: Stop the cover server after running code_SUITE:module_status/1

Leaving the cover server running could cause problems in other
test cases.
---
 lib/kernel/test/code_SUITE.erl | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'lib')

diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index afc32283ba..6f8e949aac 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -1791,6 +1791,19 @@ do_normalized_paths([]) ->
 
 %% Test that module_status/1 behaves as expected
 module_status(_Config) ->
+    case test_server:is_cover() of
+        true ->
+            module_status();
+        false ->
+            %% Make sure that we terminate the cover server.
+            try
+                module_status()
+            after
+                cover:stop()
+            end
+    end.
+
+module_status() ->
     %% basics
     not_loaded = code:module_status(fubar),     % nonexisting
     {file, preloaded} = code:is_loaded(erlang),
-- 
cgit v1.2.3