aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test/httpc_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-10-29 15:49:27 +0100
committerIngela Anderton Andin <[email protected]>2017-12-14 17:28:23 +0100
commit5ca4a8eb3e3e744a5324f5e52d5b9d561a4dbf92 (patch)
treec9964a41960d97eeeaaf3373545509264fb94ae0 /lib/inets/test/httpc_SUITE.erl
parent6cff0adb1ccf83a8e156450285e48ae2563e2009 (diff)
downloadotp-5ca4a8eb3e3e744a5324f5e52d5b9d561a4dbf92.tar.gz
otp-5ca4a8eb3e3e744a5324f5e52d5b9d561a4dbf92.tar.bz2
otp-5ca4a8eb3e3e744a5324f5e52d5b9d561a4dbf92.zip
inets: Add comparable benchmark tests
Diffstat (limited to 'lib/inets/test/httpc_SUITE.erl')
-rw-r--r--lib/inets/test/httpc_SUITE.erl13
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 =