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_config_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_config_SUITE_data')
-rw-r--r-- | lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl | 2 | ||||
-rw-r--r-- | lib/common_test/test/ct_config_SUITE_data/config/test/config_server.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl index 8ee12a2e4d..182d6e2c6e 100644 --- a/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl +++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl @@ -35,7 +35,7 @@ %% which will return the list with the following variables: %% localtime = the erlang:localtime() result in list [{date, Date}, {time, Time}] %% node = erlang:node() - can be compared in the testcase -%% now = erlang:now() - easier to compare than localtime() +%% now = os:timestamp() - easier to compare than localtime() %% config_server_pid - pid of the config server, should NOT change! %% config_server_vsn - .19 %% config_server_iteration - a number of iteration config_server's loop done diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_server.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_server.erl index 8463fea645..e65d6584b1 100644 --- a/lib/common_test/test/ct_config_SUITE_data/config/test/config_server.erl +++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_server.erl @@ -73,7 +73,7 @@ loop(Iteration)-> [{localtime, [{date, D}, {time, T}]}, {node, erlang:node()}, {config_server_iteration, Iteration}, - {now, erlang:now()}, + {now, os:timestamp()}, {config_server_pid, self()}, {config_server_vsn, ?vsn}], Config2 = if Iteration rem 2 == 0-> |