diff options
| author | Erland Schönbeck <erland@erlang.org> | 2015-03-02 14:42:28 +0100 |
|---|---|---|
| committer | Erland Schönbeck <erland@erlang.org> | 2015-03-02 14:42:28 +0100 |
| commit | b72b492bd2b0e8e1d28897fb497d7151e30c1dbf (patch) | |
| tree | a64d2243bce1ba7ee785f5d32f2f92b8bd35edc9 /lib | |
| parent | af972aaf14a5f53510e692f48f672f7e6805ee6d (diff) | |
| download | erlang-b72b492bd2b0e8e1d28897fb497d7151e30c1dbf.tar.gz | |
Update new time API and be back-compatible in ssh
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssh/test/ssh_basic_SUITE.erl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl index 094a3a7fc7..6f37940f69 100644 --- a/lib/ssh/test/ssh_basic_SUITE.erl +++ b/lib/ssh/test/ssh_basic_SUITE.erl @@ -721,9 +721,7 @@ ssh_connect_arg4_timeout(_Config) -> catch error:undef -> %% Use Erlang system time as monotonic time - {MS, S, US} = erlang:now(), - %%(MS*1000000+S)*1000000+US - {MS, S, US} + erlang:now() end, Rc = ssh:connect("localhost",Port,[],Timeout), ct:log("Client ssh:connect got ~p",[Rc]), @@ -733,14 +731,12 @@ ssh_connect_arg4_timeout(_Config) -> %% Wait for client reaction on the connection try: receive {done, Client, {error,timeout}, T0} -> - %%Msp = ms_passed(T0, now()), Msp = ms_passed(T0), exit(Server,hasta_la_vista___baby), Low = 0.9*Timeout, High = 1.1*Timeout, ct:log("Timeout limits: ~.4f - ~.4f ms, timeout " "was ~.4f ms, expected ~p ms",[Low,High,Msp,Timeout]), - %%ct:log("Timeout limits: ~p--~p, my timeout was ~p, expected ~p",[Low,High,Msp0,Timeout]), if Low<Msp, Msp<High -> ok; true -> {fail, "timeout not within limits"} |