diff options
| author | Rickard Green <[email protected]> | 2016-08-30 16:25:00 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-30 16:25:00 +0200 |
| commit | 925984e94f2c1933bb659dfb626c191982b7c8d4 (patch) | |
| tree | d1c5bec6861970d2c7e0d8090d39d8e77c2d4616 /erts/emulator/test/after_SUITE.erl | |
| parent | d419ca5917d4d27afe0518e5e5c444af5b11f480 (diff) | |
| parent | fc85e401ee279cc3b69635a71ffa93544ce5b99d (diff) | |
| download | otp-925984e94f2c1933bb659dfb626c191982b7c8d4.tar.gz otp-925984e94f2c1933bb659dfb626c191982b7c8d4.tar.bz2 otp-925984e94f2c1933bb659dfb626c191982b7c8d4.zip | |
Merge branch 'rickard/time-unit/OTP-13735' into maint
* rickard/time-unit/OTP-13735:
Update test-cases to use new symbolic time units
Replace misspelled symbolic time units
Conflicts:
erts/doc/src/erlang.xml
erts/emulator/test/long_timers_test.erl
Diffstat (limited to 'erts/emulator/test/after_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/after_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/test/after_SUITE.erl b/erts/emulator/test/after_SUITE.erl index 4f20ad3656..b1f7e06bf5 100644 --- a/erts/emulator/test/after_SUITE.erl +++ b/erts/emulator/test/after_SUITE.erl @@ -223,7 +223,7 @@ recv_after_32bit(_, _) -> blaster() -> receive {go, TimeoutTime} -> - Tmo = TimeoutTime - erlang:monotonic_time(milli_seconds), + Tmo = TimeoutTime - erlang:monotonic_time(millisecond), receive after Tmo -> ok end end. @@ -234,7 +234,7 @@ spawn_blasters(N) -> receive_after_blast(Config) when is_list(Config) -> PMs = spawn_blasters(10000), - TimeoutTime = erlang:monotonic_time(milli_seconds) + 5000, + TimeoutTime = erlang:monotonic_time(millisecond) + 5000, lists:foreach(fun ({P, _}) -> P ! {go, TimeoutTime} end, PMs), lists:foreach(fun ({P, M}) -> receive |