aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/busy_port_SUITE.erl
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-08-30 16:25:00 +0200
committerRickard Green <[email protected]>2016-08-30 16:25:00 +0200
commit925984e94f2c1933bb659dfb626c191982b7c8d4 (patch)
treed1c5bec6861970d2c7e0d8090d39d8e77c2d4616 /erts/emulator/test/busy_port_SUITE.erl
parentd419ca5917d4d27afe0518e5e5c444af5b11f480 (diff)
parentfc85e401ee279cc3b69635a71ffa93544ce5b99d (diff)
downloadotp-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/busy_port_SUITE.erl')
-rw-r--r--erts/emulator/test/busy_port_SUITE.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/test/busy_port_SUITE.erl b/erts/emulator/test/busy_port_SUITE.erl
index bb0632ae08..7094cee992 100644
--- a/erts/emulator/test/busy_port_SUITE.erl
+++ b/erts/emulator/test/busy_port_SUITE.erl
@@ -469,12 +469,12 @@ hs_busy_pcmd(Prt, Opts, StartFun, EndFun) ->
P = spawn_link(fun () ->
erlang:yield(),
Tester ! {self(), doing_port_command},
- Start = erlang:monotonic_time(micro_seconds),
+ Start = erlang:monotonic_time(microsecond),
Res = try {return,
port_command(Prt, [], Opts)}
catch Exception:Error -> {Exception, Error}
end,
- End = erlang:monotonic_time(micro_seconds),
+ End = erlang:monotonic_time(microsecond),
Time = round((End - Start)/1000),
Tester ! {self(), port_command_result, Res, Time}
end),
@@ -717,7 +717,7 @@ run_command(_M,spawn,{Args,Opts}) ->
run_command(M,spawn,Args) ->
run_command(M,spawn,{Args,[]});
run_command(Mod,Func,Args) ->
- erlang:display({{Mod,Func,Args}, erlang:system_time(micro_seconds)}),
+ erlang:display({{Mod,Func,Args}, erlang:system_time(microsecond)}),
apply(Mod,Func,Args).
validate_scenario(Data,[{print,Var}|T]) ->