diff options
| author | Björn Gustavsson <[email protected]> | 2011-09-28 11:03:37 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-09-28 11:03:37 +0200 |
| commit | a1e73008b8dc8161922b1a47ffad4a4b61885ef8 (patch) | |
| tree | 2d9c2d741c3616b8099afdfbb0dc6078b43a6d64 /erts/emulator/test/distribution_SUITE.erl | |
| parent | 4d910fc9b179cc630912165998d41a4a047148af (diff) | |
| parent | e2fb86d483ffcb5654a0e2c482f7c04442a83d22 (diff) | |
| download | otp-a1e73008b8dc8161922b1a47ffad4a4b61885ef8.tar.gz otp-a1e73008b8dc8161922b1a47ffad4a4b61885ef8.tar.bz2 otp-a1e73008b8dc8161922b1a47ffad4a4b61885ef8.zip | |
Merge branch 'bjorn/fix-test-cases' into dev
* bjorn/fix-test-cases:
distribution_SUITE:bulk_send_bigbig/1: Fail with more information
distribution_SUITE: Use unique slave node names
busy_port_SUITE: Avoid crash in register/2
Diffstat (limited to 'erts/emulator/test/distribution_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/distribution_SUITE.erl | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl index e4af5c00a6..3eaacdb044 100644 --- a/erts/emulator/test/distribution_SUITE.erl +++ b/erts/emulator/test/distribution_SUITE.erl @@ -173,15 +173,20 @@ bulk_sendsend(Terms, BinSize) -> Ratio = if MonitorCount2 == 0 -> MonitorCount1 / 1.0; true -> MonitorCount1 / MonitorCount2 end, - %% A somewhat arbitrary ratio, but hopefully one that will accommodate - %% a wide range of CPU speeds. - true = (Ratio > 8.0), - {comment, - integer_to_list(Rate1) ++ " K/s, " ++ - integer_to_list(Rate2) ++ " K/s, " ++ - integer_to_list(MonitorCount1) ++ " monitor msgs, " ++ - integer_to_list(MonitorCount2) ++ " monitor msgs, " ++ - float_to_list(Ratio) ++ " monitor ratio"}. + Comment = integer_to_list(Rate1) ++ " K/s, " ++ + integer_to_list(Rate2) ++ " K/s, " ++ + integer_to_list(MonitorCount1) ++ " monitor msgs, " ++ + integer_to_list(MonitorCount2) ++ " monitor msgs, " ++ + float_to_list(Ratio) ++ " monitor ratio", + if + %% A somewhat arbitrary ratio, but hopefully one that will + %% accommodate a wide range of CPU speeds. + Ratio > 8.0 -> + {comment,Comment}; + true -> + io:put_chars(Comment), + ?line ?t:fail(ratio_too_low) + end. bulk_sendsend2(Terms, BinSize, BusyBufSize) -> ?line Dog = test_server:timetrap(test_server:seconds(30)), @@ -1597,8 +1602,8 @@ bad_dist_ext_control(Config) when is_list(Config) -> ?line stop_node(Victim). bad_dist_ext_connection_id(Config) when is_list(Config) -> - ?line {ok, Offender} = start_node(bad_dist_ext_receive_offender), - ?line {ok, Victim} = start_node(bad_dist_ext_receive_victim), + ?line {ok, Offender} = start_node(bad_dist_ext_connection_id_offender), + ?line {ok, Victim} = start_node(bad_dist_ext_connection_id_victim), ?line start_node_monitors([Offender,Victim]), ?line Parent = self(), |