aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-02-07 16:18:32 +0100
committerSiri Hansen <[email protected]>2014-02-24 11:41:10 +0100
commit0256f0e352021e56c3d130caed14a50d573939cb (patch)
treea9c3a001a04e2ee23bad2cfd1a2d54b139f45a7d
parentaeb2f71edb6ecba094dcfeddf8f8255229f90b9b (diff)
downloadotp-0256f0e352021e56c3d130caed14a50d573939cb.tar.gz
otp-0256f0e352021e56c3d130caed14a50d573939cb.tar.bz2
otp-0256f0e352021e56c3d130caed14a50d573939cb.zip
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.
-rw-r--r--erts/test/upgrade_SUITE.erl5
1 files changed, 4 insertions, 1 deletions
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.
%%%-----------------------------------------------------------------