From 0256f0e352021e56c3d130caed14a50d573939cb Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Fri, 7 Feb 2014 16:18:32 +0100
Subject: In upgrade_SUITE stop node with init:stop instead of
 test_server:stop_node

This is only for nodes not started with test_server:start_node.
---
 erts/test/upgrade_SUITE.erl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl
index 16a805db52..9f15437772 100644
--- a/erts/test/upgrade_SUITE.erl
+++ b/erts/test/upgrade_SUITE.erl
@@ -236,7 +236,10 @@ do_upgrade(FromVsn,FromApps,ToRel,ToApps,InstallDir) ->
      {"OTP upgrade test",FromVsn,_,old}] =
 	rpc:call(Node,release_handler,which_releases,[]),
     
-    true = test_server:stop_node(Node),
+    erlang:monitor_node(Node,true),
+    _ = rpc:call(Node,init,stop,[]),
+    receive {nodedown,Node} -> ok end,
+
     ok.
 
 %%%-----------------------------------------------------------------
-- 
cgit v1.2.3