diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-12-15 11:04:35 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-12-15 11:04:35 +0100 |
| commit | 5ad63d8a404db14edbb221565baf518728b71426 (patch) | |
| tree | 5269706197ac9013a393bc36bcc57e2c1ed26cd6 /lib/inets/test/httpc_SUITE.erl | |
| parent | 64ada689858df2f03388b1c15e96abcf6e5a55c0 (diff) | |
| parent | 9b61f4f4b26a77ca08b2a4a4f7776aac58bdff53 (diff) | |
| download | otp-5ad63d8a404db14edbb221565baf518728b71426.tar.gz otp-5ad63d8a404db14edbb221565baf518728b71426.tar.bz2 otp-5ad63d8a404db14edbb221565baf518728b71426.zip | |
Merge branch 'maint'
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 1e912e7640..9b5317c6bb 100644 --- a/lib/inets/test/httpc_SUITE.erl +++ b/lib/inets/test/httpc_SUITE.erl @@ -1359,13 +1359,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) -> @@ -1469,13 +1469,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 @@ -1629,7 +1623,6 @@ handle_request(Module, Function, Args, Socket) -> end. handle_http_msg({Method, RelUri, _, {_, Headers}, Body}, Socket) -> - ct:print("Request: ~p ~p", [Method, RelUri]), NextRequest = |