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/estone_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/estone_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/estone_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/estone_SUITE.erl b/erts/emulator/test/estone_SUITE.erl index 1180a45585..3ce849b88e 100644 --- a/erts/emulator/test/estone_SUITE.erl +++ b/erts/emulator/test/estone_SUITE.erl @@ -364,7 +364,7 @@ monotonic_time() -> try erlang:monotonic_time() catch error:undef -> erlang:now() end. subtr(Before, After) when is_integer(Before), is_integer(After) -> - erlang:convert_time_unit(After-Before, native, micro_seconds); + erlang:convert_time_unit(After-Before, native, microsecond); subtr({_,_,_}=Before, {_,_,_}=After) -> timer:now_diff(After, Before). |