diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-12-15 11:02:17 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-12-15 11:02:17 +0100 |
| commit | 9b61f4f4b26a77ca08b2a4a4f7776aac58bdff53 (patch) | |
| tree | c9964a41960d97eeeaaf3373545509264fb94ae0 /lib/inets/test/httpc_SUITE.erl | |
| parent | ca00af6271665772c97bb2e146b0f5cbb760a97c (diff) | |
| parent | 5ca4a8eb3e3e744a5324f5e52d5b9d561a4dbf92 (diff) | |
| download | otp-9b61f4f4b26a77ca08b2a4a4f7776aac58bdff53.tar.gz otp-9b61f4f4b26a77ca08b2a4a4f7776aac58bdff53.tar.bz2 otp-9b61f4f4b26a77ca08b2a4a4f7776aac58bdff53.zip | |
Merge branch 'ingela/inets/http-benchmarks' into maint
* ingela/inets/http-benchmarks:
inets: Add comparable benchmark tests
inets: Create httpd benchmark framwork
Diffstat (limited to 'lib/inets/test/httpc_SUITE.erl')
| -rw-r--r-- | lib/inets/test/httpc_SUITE.erl | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl index 75b50f3420..03178b3b2e 100644 --- a/lib/inets/test/httpc_SUITE.erl +++ b/lib/inets/test/httpc_SUITE.erl @@ -1318,13 +1318,13 @@ group_name(Config) -> server_start(sim_http, _) -> Inet = inet_version(), ok = httpc:set_options([{ipfamily, Inet}]), - {_Pid, Port} = dummy_server(Inet), + {_Pid, Port} = http_test_lib:dummy_server(ip_comm, Inet, [{content_cb, ?MODULE}]), Port; server_start(sim_https, SslConfig) -> Inet = inet_version(), ok = httpc:set_options([{ipfamily, Inet}]), - {_Pid, Port} = dummy_server(ssl, Inet, SslConfig), + {_Pid, Port} = http_test_lib:dummy_server(ssl, Inet, [{ssl, SslConfig}, {content_cb, ?MODULE}]), Port; server_start(_, HttpdConfig) -> @@ -1428,13 +1428,7 @@ receive_replys([ID|IDs]) -> ct:pal({recived_canceld_id, Other}) end. -%% Perform a synchronous stop -dummy_server_stop(Pid) -> - Pid ! {stop, self()}, - receive - {stopped, Pid} -> - ok - end. + inet_version() -> inet. %% Just run inet for now @@ -1588,7 +1582,6 @@ handle_request(Module, Function, Args, Socket) -> end. handle_http_msg({Method, RelUri, _, {_, Headers}, Body}, Socket) -> - ct:print("Request: ~p ~p", [Method, RelUri]), NextRequest = |