diff options
| author | Erland Schönbeck <[email protected]> | 2015-03-25 12:55:19 +0100 |
|---|---|---|
| committer | Erland Schönbeck <[email protected]> | 2015-03-25 12:55:19 +0100 |
| commit | d6797e9a34df677e82db5ee8b8388fbdf57f09f5 (patch) | |
| tree | 1229a0acce281d4185d1ffcea44569947c31009c /lib/inets/test/httpd_time_test.erl | |
| parent | a206e66f13471cdad02a966fcb569673e0938fa4 (diff) | |
| parent | e10385909c687590d6522d007bba9d72f3f5c380 (diff) | |
| download | otp-d6797e9a34df677e82db5ee8b8388fbdf57f09f5.tar.gz otp-d6797e9a34df677e82db5ee8b8388fbdf57f09f5.tar.bz2 otp-d6797e9a34df677e82db5ee8b8388fbdf57f09f5.zip | |
Merge branch 'erland/OTP18/inets/time_api/OTP-12441'
* erland/OTP18/inets/time_api/OTP-12441:
inets: Add new module inets_time_compat with new time API The new module is backwards compatible.
Diffstat (limited to 'lib/inets/test/httpd_time_test.erl')
| -rw-r--r-- | lib/inets/test/httpd_time_test.erl | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/inets/test/httpd_time_test.erl b/lib/inets/test/httpd_time_test.erl index b3e6746a01..7dd61a5517 100644 --- a/lib/inets/test/httpd_time_test.erl +++ b/lib/inets/test/httpd_time_test.erl @@ -18,7 +18,6 @@ %% %% -module(httpd_time_test). --compile([{nowarn_deprecated_function,{erlang,now,0}}]). -export([t/3, t1/2, t2/2, t4/2]). @@ -117,15 +116,7 @@ main(N, SocketType, Host, Port, Time) loop(Pollers, Timeout) -> d("loop -> entry when" "~n Timeout: ~p", [Timeout]), - %% Adapt to OTP 18 erlang time API and be backwards compatible - Start = try - erlang:monotonic_time(1000) - catch - error:undef -> - %% Use Erlang system time as monotonic time - {A,B,C} = erlang:now(), - A*1000000000+B*1000+(C div 1000) - end, + Start = inets_time_compat:monotonic_time(), receive {'EXIT', Pid, {poller_stat_failure, SocketType, Host, Port, Time, Reason}} -> |