diff options
| author | Lars Thorsen <[email protected]> | 2016-05-18 15:23:31 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2016-05-18 15:23:31 +0200 |
| commit | c8cd6f30021d5f28e06d89a6acf834d770b9e972 (patch) | |
| tree | b80f97812a4c4db4a291b332457b17cd140d0213 /lib/inets/test | |
| parent | a1086ac00ece8044b4055047aaac2f912a5ca18e (diff) | |
| parent | 121fc1f2bcc75f974d3dc4ff6a1af5f2b0cd0492 (diff) | |
| download | otp-c8cd6f30021d5f28e06d89a6acf834d770b9e972.tar.gz otp-c8cd6f30021d5f28e06d89a6acf834d770b9e972.tar.bz2 otp-c8cd6f30021d5f28e06d89a6acf834d770b9e972.zip | |
Merge branch 'lars/inets-deprecated-now/OTP-12441'
* lars/inets-deprecated-now/OTP-12441:
[inets] Remove calls to the inets_time_compat module
[inets] Remove usage of erlang:now()
Diffstat (limited to 'lib/inets/test')
| -rw-r--r-- | lib/inets/test/ftp_suite_lib.erl | 2 | ||||
| -rw-r--r-- | lib/inets/test/httpc_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/inets/test/httpd_time_test.erl | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/inets/test/ftp_suite_lib.erl b/lib/inets/test/ftp_suite_lib.erl index 71985df877..0f82b1c1c3 100644 --- a/lib/inets/test/ftp_suite_lib.erl +++ b/lib/inets/test/ftp_suite_lib.erl @@ -1353,7 +1353,7 @@ do_delete(Pid, Config) -> do_mkdir(Pid) -> NewDir = "earl_" ++ - integer_to_list(inets_time_compat:unique_integer([positive])), + integer_to_list(erlang:unique_integer([positive])), ok = ftp:cd(Pid, "incoming"), {ok, CurrDir} = ftp:pwd(Pid), diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl index f9b3aa5b59..e6c4e48feb 100644 --- a/lib/inets/test/httpc_SUITE.erl +++ b/lib/inets/test/httpc_SUITE.erl @@ -2077,7 +2077,7 @@ run_clients(NumClients, ServerPort, SeqNumServer) -> wait4clients([], _Timeout) -> ok; wait4clients(Clients, Timeout) when Timeout > 0 -> - Time = inets_time_compat:monotonic_time(), + Time = erlang:monotonic_time(), receive {'DOWN', _MRef, process, Pid, normal} -> @@ -2177,7 +2177,7 @@ parse_connection_type(Request) -> end. set_random_seed() -> - Unique = inets_time_compat:unique_integer(), + Unique = erlang:unique_integer(), A = erlang:phash2([make_ref(), self(), Unique]), random:seed(A, A, A). diff --git a/lib/inets/test/httpd_time_test.erl b/lib/inets/test/httpd_time_test.erl index fddc0003cd..e858ddf4f6 100644 --- a/lib/inets/test/httpd_time_test.erl +++ b/lib/inets/test/httpd_time_test.erl @@ -117,7 +117,7 @@ main(N, SocketType, Host, Port, Time) loop(Pollers, Timeout) -> d("loop -> entry when" "~n Timeout: ~p", [Timeout]), - Start = inets_time_compat:monotonic_time(), + Start = erlang:monotonic_time(), receive {'EXIT', Pid, {poller_stat_failure, SocketType, Host, Port, Time, Reason}} -> |