diff options
| author | Peter Andersson <[email protected]> | 2015-03-11 09:41:11 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-20 15:28:54 +0100 |
| commit | a219c06f31e082449a1e001c051661370fa00a5d (patch) | |
| tree | 0b99ba0aabbee1d970ffe48b7fe599b536382d1e /lib/common_test/test/ct_error_SUITE_data | |
| parent | d2c19c15b887d44b92fa36c5f49d7f2ff755f8ad (diff) | |
| download | otp-a219c06f31e082449a1e001c051661370fa00a5d.tar.gz otp-a219c06f31e082449a1e001c051661370fa00a5d.tar.bz2 otp-a219c06f31e082449a1e001c051661370fa00a5d.zip | |
Replace all calls to now/0 in CT with new time API functions
Diffstat (limited to 'lib/common_test/test/ct_error_SUITE_data')
| -rw-r--r-- | lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl | 5 | ||||
| -rw-r--r-- | lib/common_test/test/ct_error_SUITE_data/error/test/verify_config.erl | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl index a77d06815e..d926fc55a4 100644 --- a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl +++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl @@ -141,12 +141,13 @@ tc3() -> [{timetrap,{seconds,2}}]. tc3(_) -> - T0 = now(), + T0 = erlang:monotonic_time(), ct:timetrap(infinity), N = list_to_integer(ct:get_config(multiply)), ct:comment(io_lib:format("Sleeping for ~w sec...", [4*N])), ct:sleep(4000), - Diff = timer:now_diff(now(), T0), + T1 = erlang:monotonic_time(), + Diff = erlang:convert_time_unit(T1-T0, native, micro_seconds), if ((Diff < (N*4000000)) or (Diff > (N*4500000))) -> exit(not_expected); true -> diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/verify_config.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/verify_config.erl index 446dd8bfdf..d5b3e0035a 100644 --- a/lib/common_test/test/ct_error_SUITE_data/error/test/verify_config.erl +++ b/lib/common_test/test/ct_error_SUITE_data/error/test/verify_config.erl @@ -81,7 +81,7 @@ init(Id, Opts) -> -spec id(Opts :: proplists:proplist()) -> Id :: term(). id(Opts) -> - now(). + os:timestamp(). %% @doc Called before init_per_suite is called. Note that this callback is %% only called if the CTH is added before init_per_suite is run (eg. in a test |