diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-10-22 17:12:35 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-10-23 14:30:30 +0200 |
| commit | 6f0a76a0f78f3483b561b5e59260e8ca968b052c (patch) | |
| tree | 8e6deab0f7e6bc8fdbbdde6db8619859fddf0af8 | |
| parent | a986416859aa6065e44d7288b37152756ac1b0ce (diff) | |
| download | otp-6f0a76a0f78f3483b561b5e59260e8ca968b052c.tar.gz otp-6f0a76a0f78f3483b561b5e59260e8ca968b052c.tar.bz2 otp-6f0a76a0f78f3483b561b5e59260e8ca968b052c.zip | |
test: Relax timeouts for heart_SUITE
Timeouts were set too narrow and timedout on slow machines
| -rw-r--r-- | lib/kernel/test/heart_SUITE.erl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl index 2bed8bee26..e64d2914c4 100644 --- a/lib/kernel/test/heart_SUITE.erl +++ b/lib/kernel/test/heart_SUITE.erl @@ -209,9 +209,14 @@ node_start_immediately_after_crash(Config) when is_list(Config) -> rpc:call(Node, erlang, load_module, [Mod, Code]), rpc:cast(Node, Mod, do, []), + T0 = now(), - receive {nodedown, Node} -> ok - after 2000 -> test_server:fail(node_not_closed) + receive {nodedown, Node} -> + test_server:format("Took ~.2f s. for node to go down~n", [timer:now_diff(now(), T0)/1000000]), + ok + %% timeout is very liberal here. nodedown is received in about 1 s. on linux (palantir) + %% and in about 10 s. on solaris (carcharoth) + after (15000*test_server:timetrap_scale_factor()) -> test_server:fail(node_not_closed) end, test_server:sleep(3000), node_check_up_down(Node, 2000), @@ -245,7 +250,7 @@ node_start_soon_after_crash(Config) when is_list(Config) -> rpc:cast(Node, Mod, do, []), receive {nodedown, Node} -> ok - after 15000 -> test_server:fail(node_not_closed) + after (15000*test_server:timetrap_scale_factor()) -> test_server:fail(node_not_closed) end, test_server:sleep(20000), node_check_up_down(Node, 15000), |