diff options
| author | Rickard Green <[email protected]> | 2015-06-02 19:50:47 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-06-09 19:35:48 +0200 |
| commit | f71ce89e2ca069b8526f27aee333deea9209a8b6 (patch) | |
| tree | bfa45b29133db7dea457db89e0219c9274f4987d /erts/emulator/test | |
| parent | 79729c7d95cfc2b163c55071589e83019247c5a1 (diff) | |
| download | otp-f71ce89e2ca069b8526f27aee333deea9209a8b6.tar.gz otp-f71ce89e2ca069b8526f27aee333deea9209a8b6.tar.bz2 otp-f71ce89e2ca069b8526f27aee333deea9209a8b6.zip | |
Fix test cases
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/long_timers_test.erl | 4 | ||||
| -rw-r--r-- | erts/emulator/test/timer_bif_SUITE.erl | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/erts/emulator/test/long_timers_test.erl b/erts/emulator/test/long_timers_test.erl index f381332b51..8dd960ffd4 100644 --- a/erts/emulator/test/long_timers_test.erl +++ b/erts/emulator/test/long_timers_test.erl @@ -28,7 +28,7 @@ -define(MAX_TIMEOUT, 60). % Minutes --define(MAX_LATE_MS, 10*1000). % Milliseconds +-define(MAX_LATE_MS, 15*1000). % Milliseconds -define(REG_NAME, '___LONG___TIMERS___TEST___SERVER___'). -define(DRV_NAME, timer_driver). @@ -196,8 +196,8 @@ driver(Timeout) -> end. bif_timer(Timeout) -> - Tmr = erlang:start_timer(Timeout, self(), ok), Start = erlang:monotonic_time(), + Tmr = erlang:start_timer(Timeout, self(), ok), receive {get_result, ?REG_NAME} -> ?REG_NAME ! #timeout_rec{pid = self(), diff --git a/erts/emulator/test/timer_bif_SUITE.erl b/erts/emulator/test/timer_bif_SUITE.erl index d406456f98..3939ae9575 100644 --- a/erts/emulator/test/timer_bif_SUITE.erl +++ b/erts/emulator/test/timer_bif_SUITE.erl @@ -631,7 +631,6 @@ auto_cancel_yielding(Config) when is_list(Config) -> true = mem_larger_than(Mem), exit(P, bang), wait_until(fun () -> process_is_cleaned_up(P) end), - receive after 1000 -> ok end, Mem = mem(), ok. @@ -747,7 +746,7 @@ mem_larger_than(Mem) -> mem() > Mem. mem() -> - erts_debug:set_internal_state(wait, deallocations), + erts_debug:set_internal_state(wait, timer_cancellations), erts_debug:set_internal_state(wait, deallocations), case mem_get() of {-1, -1} -> no_fix_alloc; |