diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-04-29 17:25:36 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-05-23 18:21:11 +0200 |
| commit | 7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9 (patch) | |
| tree | 62e5c69bde3ff611d4da725939a50a04673d20de /lib/inets/test/httpd_load.erl | |
| parent | c8cd6f30021d5f28e06d89a6acf834d770b9e972 (diff) | |
| download | otp-7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9.tar.gz otp-7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9.tar.bz2 otp-7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9.zip | |
inets: Use test_server app tests and remove legacy test_server code
FTP tests needed some refactoring as some tests where lost to
the ftp_suite_lib module that was not run.
Diffstat (limited to 'lib/inets/test/httpd_load.erl')
| -rw-r--r-- | lib/inets/test/httpd_load.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/inets/test/httpd_load.erl b/lib/inets/test/httpd_load.erl index 37ebc4fc90..7f4d16139f 100644 --- a/lib/inets/test/httpd_load.erl +++ b/lib/inets/test/httpd_load.erl @@ -63,7 +63,7 @@ load_test(Fun, URIs, Type, Host, Port, Node, 0, List) -> {'EXIT', Pid, Reason} -> Str = lists:flatten(io_lib:format("client ~p exited: ~p", [Pid,Reason])), - test_server:fail(Str); + ct:fail(Str); _ -> load_test(Fun, URIs, Type, Host, Port, Node, 0, List) end; @@ -86,12 +86,11 @@ load_test_client(Fun, [URI|URIs], Type, Host, Port, Node, Boss, Timeout) -> {'EXIT', {suite_failed, connection_closed, _, _}} -> %% Some platforms seems to handle heavy load badly. %% So, back off and see if this helps - %%?LOG("load_test_client->requestfailed:connection_closed"[]), 2 * Timeout; _ -> Timeout end, - test_server:sleep(Timeout1), + ct:sleep(Timeout1), load_test_client(Fun, URIs, Type, Host, Port, Node, Boss, Timeout1). load_test_client_done(Boss) -> |