diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-06-17 16:32:08 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-06-17 16:32:08 +0200 |
| commit | 00f92e552cb62233ad9dec788f4826b3e1dab4f7 (patch) | |
| tree | 2d55e4b3ab15953ae0f9a8443ca95d067cb852a7 /erts | |
| parent | aae5a947a0c1c6dc6881cf9e5d81b7363055a04d (diff) | |
| parent | 549428e11f1d9b4d61135a36fc9ab594c5512d6b (diff) | |
| download | otp-00f92e552cb62233ad9dec788f4826b3e1dab4f7.tar.gz otp-00f92e552cb62233ad9dec788f4826b3e1dab4f7.tar.bz2 otp-00f92e552cb62233ad9dec788f4826b3e1dab4f7.zip | |
Merge branch 'egil/cuddle-tests'
* egil/cuddle-tests:
kernel: Remove ?line macros in inet_SUITE:t_gethostbyaddr/1
erts: Tweak statistics_SUITE:scheduler_wall_time/1
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/test/statistics_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/test/statistics_SUITE.erl b/erts/emulator/test/statistics_SUITE.erl index c428be6c5a..16cee81158 100644 --- a/erts/emulator/test/statistics_SUITE.erl +++ b/erts/emulator/test/statistics_SUITE.erl @@ -308,7 +308,7 @@ scheduler_wall_time(Config) when is_list(Config) -> try Schedulers = erlang:system_info(schedulers_online), %% Let testserver and everyone else finish their work - timer:sleep(500), + timer:sleep(1500), %% Empty load EmptyLoad = get_load(), {false, _} = {lists:any(fun(Load) -> Load > 50 end, EmptyLoad),EmptyLoad}, @@ -347,7 +347,7 @@ scheduler_wall_time(Config) when is_list(Config) -> [exit(Pid, kill) || Pid <- [P1|HalfHogs++LastHogs]], AfterLoad = get_load(), - {false,_} = {lists:any(fun(Load) -> Load > 5 end, AfterLoad),AfterLoad}, + {false,_} = {lists:any(fun(Load) -> Load > 25 end, AfterLoad),AfterLoad}, true = erlang:system_flag(scheduler_wall_time, false) after erlang:system_flag(scheduler_wall_time, false) @@ -355,7 +355,7 @@ scheduler_wall_time(Config) when is_list(Config) -> get_load() -> Start = erlang:statistics(scheduler_wall_time), - timer:sleep(500), + timer:sleep(1500), End = erlang:statistics(scheduler_wall_time), lists:reverse(lists:sort(load_percentage(lists:sort(Start),lists:sort(End)))). |