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/httpc_SUITE.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/httpc_SUITE.erl')
| -rw-r--r-- | lib/inets/test/httpc_SUITE.erl | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl index 2193588031..0dfc65e8f7 100644 --- a/lib/inets/test/httpc_SUITE.erl +++ b/lib/inets/test/httpc_SUITE.erl @@ -31,7 +31,6 @@ -include("httpc_internal.hrl"). %% Note: This directive should only be used in test suites. -compile(export_all). --compile([{nowarn_deprecated_function,{erlang,now,0}}]). -define(URL_START, "http://"). -define(TLS_URL_START, "https://"). @@ -1934,14 +1933,8 @@ run_clients(NumClients, ServerPort, SeqNumServer) -> wait4clients([], _Timeout) -> ok; wait4clients(Clients, Timeout) when Timeout > 0 -> - %% Adapt to OTP 18 erlang time API and be backwards compatible - Time = try - erlang:monotonic_time() - catch - error:undef -> - %% Use Erlang system time as monotonic time - erlang:now() - end, + Time = inets_time_compat:monotonic_time(), + receive {'DOWN', _MRef, process, Pid, normal} -> {value, {Id, _, _}} = lists:keysearch(Pid, 2, Clients), @@ -2040,14 +2033,8 @@ parse_connection_type(Request) -> end. set_random_seed() -> - %% Adapt to OTP 18 erlang time API and be backwards compatible - Unique = try - erlang:unique_integer() - catch - error:undef -> - {MS, S, US} = erlang:now(), - (MS*1000000+S)*1000000+US - end, + Unique = inets_time_compat:unique_integer(), + A = erlang:phash2([make_ref(), self(), Unique]), random:seed(A, A, A). |