diff options
| author | Rickard Green <[email protected]> | 2016-08-30 15:22:40 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-30 15:22:40 +0200 |
| commit | 16f4bd5f6cb5fe6d6412ae219634902813bd9cce (patch) | |
| tree | 76a2609df5f8604769315cd23502d566f133a67e /erts/emulator/test/timer_bif_SUITE.erl | |
| parent | a74e538f5fa73aed871a62f4f25efe06c1df19e6 (diff) | |
| parent | 93fb8ecb7ed41e7c441b1c72901d6db76c24fd8d (diff) | |
| download | otp-16f4bd5f6cb5fe6d6412ae219634902813bd9cce.tar.gz otp-16f4bd5f6cb5fe6d6412ae219634902813bd9cce.tar.bz2 otp-16f4bd5f6cb5fe6d6412ae219634902813bd9cce.zip | |
Merge branch 'rickard/test-cuddle' into maint
* rickard/test-cuddle:
Fix dirty_nif_SUITE:dirty_call_while_terminated test case
Adjust process_SUITE:no_priority_inversion2
Allow larger timeout delay in driver_SUITE
Ignore long time failures during high CPU utilization
Cleanup in statistics_SUITE:runtime_update test
Improve timer tests in driver_SUITE
Fix statistics_SUITE:scheduler_wall_time test
Fix scheduler_SUITE:scheduler_suspend test
Fix scheduler_SUITE:scheduler_threads test
Fix scheduler_SUITE:update_cpu_info test
Skip nif_SUITE:consume_timeslice test when debug compiled
Increase time margin in timer_bif_SUITE:start_timer_1 test
Diffstat (limited to 'erts/emulator/test/timer_bif_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/timer_bif_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/test/timer_bif_SUITE.erl b/erts/emulator/test/timer_bif_SUITE.erl index a5f11bd959..44f276f232 100644 --- a/erts/emulator/test/timer_bif_SUITE.erl +++ b/erts/emulator/test/timer_bif_SUITE.erl @@ -74,7 +74,7 @@ all() -> %% Basic start_timer/3 functionality start_timer_1(Config) when is_list(Config) -> Ref1 = erlang:start_timer(1000, self(), plopp), - ok = get(1100, {timeout, Ref1, plopp}), + ok = get(1400, {timeout, Ref1, plopp}), false = erlang:read_timer(Ref1), false = erlang:cancel_timer(Ref1), @@ -83,12 +83,12 @@ start_timer_1(Config) when is_list(Config) -> Ref2 = erlang:start_timer(1000, self(), plapp), Left2 = erlang:cancel_timer(Ref2), UpperLimit = 1000, - true = (Left2 > 900) and (Left2 =< UpperLimit), + true = (Left2 > 600) and (Left2 =< UpperLimit), empty = get_msg(), false = erlang:cancel_timer(Ref2), Ref3 = erlang:start_timer(1000, self(), plopp), - no_message = get(900, {timeout, Ref3, plopp}), + no_message = get(600, {timeout, Ref3, plopp}), ok. %% Basic send_after/3 functionality |