diff options
| author | Siri Hansen <[email protected]> | 2013-01-09 08:51:12 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-01-09 08:51:12 +0100 |
| commit | 151f7832c74975297b1dce6302dd192285d7c2a8 (patch) | |
| tree | 3fc10ca9a6c0ef9be212c5bb3e650b865d260abb /lib/test_server/test | |
| parent | 9767e72b44ebd0cd5277634c4a37318479623c2d (diff) | |
| parent | 06ad426384ab6c5f5966c4f5ae87be0fb01f346c (diff) | |
| download | otp-151f7832c74975297b1dce6302dd192285d7c2a8.tar.gz otp-151f7832c74975297b1dce6302dd192285d7c2a8.tar.bz2 otp-151f7832c74975297b1dce6302dd192285d7c2a8.zip | |
Merge branch 'siri/cover/new-bugs-r16/OTP-10638'
* siri/cover/new-bugs-r16/OTP-10638:
[cover] Cleanup by stopping cover between tests
[common_test] Stop cover on slave node after node is terminated
[test_server] Stop cover on node after node is terminated
[cover] Fix timing dependent bug in cover_SUITE:reconnect
[cover] Remove stopped node also from lost_nodes list
[cover] Don't mark stopped node as lost
Diffstat (limited to 'lib/test_server/test')
| -rw-r--r-- | lib/test_server/test/test_server_test_lib.erl | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/test_server/test/test_server_test_lib.erl b/lib/test_server/test/test_server_test_lib.erl index 4e89abf308..d466aa0110 100644 --- a/lib/test_server/test/test_server_test_lib.erl +++ b/lib/test_server/test/test_server_test_lib.erl @@ -83,14 +83,21 @@ start_slave(Config,_Level) -> post_end_per_testcase(_TC, Config, Return, State) -> Node = proplists:get_value(node, Config), - case test_server:is_cover() of - true -> - cover:flush(Node); - false -> - ok + Cover = test_server:is_cover(), + if Cover-> cover:flush(Node); + true -> ok end, + erlang:monitor_node(Node, true), slave:stop(Node), - + receive + {nodedown, Node} -> + if Cover -> cover:stop(Node); + true -> ok + end + after 5000 -> + erlang:monitor_node(Node, false), + receive {nodedown, Node} -> ok after 0 -> ok end %flush + end, {Return, State}. %% Parse an .suite log file |