diff options
| author | Rickard Green <[email protected]> | 2016-08-24 14:24:34 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-25 17:37:44 +0200 |
| commit | fc85e401ee279cc3b69635a71ffa93544ce5b99d (patch) | |
| tree | ebf32fa7ad9cd3f84f00c3ecc7c1e0710289f3c2 /erts/emulator/test/scheduler_SUITE.erl | |
| parent | 412b5aaa5810cbac75ef41d29a36898ff1480129 (diff) | |
| download | otp-fc85e401ee279cc3b69635a71ffa93544ce5b99d.tar.gz otp-fc85e401ee279cc3b69635a71ffa93544ce5b99d.tar.bz2 otp-fc85e401ee279cc3b69635a71ffa93544ce5b99d.zip | |
Update test-cases to use new symbolic time units
Diffstat (limited to 'erts/emulator/test/scheduler_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/scheduler_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl index f18d79d770..b44ee45da9 100644 --- a/erts/emulator/test/scheduler_SUITE.erl +++ b/erts/emulator/test/scheduler_SUITE.erl @@ -1978,10 +1978,10 @@ do_it(Tracer, Low, Normal, High, Max) -> do_it(Tracer, Low, Normal, High, Max, RedsPerSchedLimit) -> OldPrio = process_flag(priority, max), go_work(Low, Normal, High, Max), - StartWait = erlang:monotonic_time(milli_seconds), + StartWait = erlang:monotonic_time(millisecond), %% Give the emulator a chance to balance the load... wait_balance(5), - EndWait = erlang:monotonic_time(milli_seconds), + EndWait = erlang:monotonic_time(millisecond), BalanceWait = EndWait-StartWait, erlang:display({balance_wait, BalanceWait}), Timeout = (15 - 4)*60*1000 - BalanceWait, @@ -2181,7 +2181,7 @@ start_node(Config, Args) when is_list(Config) -> ++ "-" ++ atom_to_list(proplists:get_value(testcase, Config)) ++ "-" - ++ integer_to_list(erlang:system_time(seconds)) + ++ integer_to_list(erlang:system_time(second)) ++ "-" ++ integer_to_list(erlang:unique_integer([positive]))), test_server:start_node(Name, slave, [{args, "-pa "++Pa++" "++Args}]). |