aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/test/release_handler_SUITE.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2011-10-17 15:47:05 +0200
committerSiri Hansen <[email protected]>2011-11-17 16:47:29 +0100
commit1e344f34bf9f3fcc0a75b2980ab79e60d4cd71fc (patch)
tree721ee2c512fbf922316f6ea1d069f46dae38ec76 /lib/sasl/test/release_handler_SUITE.erl
parentd221b34133a8da8d62bdc57ebb724f86d7cd2fc0 (diff)
downloadotp-1e344f34bf9f3fcc0a75b2980ab79e60d4cd71fc.tar.gz
otp-1e344f34bf9f3fcc0a75b2980ab79e60d4cd71fc.tar.bz2
otp-1e344f34bf9f3fcc0a75b2980ab79e60d4cd71fc.zip
Wait for two restarts in upgrade_restart test
This is an attempt to correct a failing test case. It the test fails on having restarted only once, we give it another try to see if the second restart will happen.
Diffstat (limited to 'lib/sasl/test/release_handler_SUITE.erl')
-rw-r--r--lib/sasl/test/release_handler_SUITE.erl13
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index c2930b1039..958f6bbfc9 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -375,11 +375,18 @@ upgrade_restart(Conf) when is_list(Conf) ->
wait_nodes_up([{TestNode,TestNodeInit1}],"upgrade_restart_1",[a]),
%% install P1G
+ case rpc_inst(TestNode, upgrade_restart_2, []) of
+ ok ->
+ ok;
+ {wait,TestNodeInit2a} ->
+ %% We catched the node too early - it was supposed to
+ %% restart twice, so let's wait for one more restart.
+ wait_nodes_up([{TestNode,TestNodeInit2a}],"upgrade_restart_2a",[])
+ end,
TestNodeInit2 = rpc:call(TestNode,erlang,whereis,[init]),
- ok = rpc_inst(TestNode, upgrade_restart_2, []),
stop_cover(TestNode),
- ok = rpc_inst(TestNode, upgrade_restart_2a, []),
- wait_nodes_up([{TestNode,TestNodeInit2}],"upgrade_restart_2",[]),
+ ok = rpc_inst(TestNode, upgrade_restart_2b, []),
+ wait_nodes_up([{TestNode,TestNodeInit2}],"upgrade_restart_2b",[]),
%% Check that P1G is going again
ok = rpc_inst(TestNode, upgrade_restart_3, []),