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/httpd_time_test.erl | |
| 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/httpd_time_test.erl')
| -rw-r--r-- | lib/inets/test/httpd_time_test.erl | 2 |
1 files changed, 1 insertions, 1 deletions
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}} -> |