From 6f7b59886ec17027b16ed4d10737452e17f233d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Wed, 7 Jun 2017 15:15:54 +0200 Subject: Remove NumAcceptors argument from start_clear/tls They are now cowboy:start_clear/3 and cowboy:start_tls/3. The NumAcceptors argument can be specified via the num_acceptor transport option. Ranch has been updated to 1.4.0 to that effect. --- test/cowboy_test.erl | 6 +++--- test/http2_SUITE.erl | 2 +- test/http_SUITE.erl | 8 ++++---- test/ws_SUITE.erl | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'test') diff --git a/test/cowboy_test.erl b/test/cowboy_test.erl index a219878..bdae7e4 100644 --- a/test/cowboy_test.erl +++ b/test/cowboy_test.erl @@ -20,19 +20,19 @@ %% Listeners initialization. init_http(Ref, ProtoOpts, Config) -> - {ok, _} = cowboy:start_clear(Ref, 100, [{port, 0}], ProtoOpts), + {ok, _} = cowboy:start_clear(Ref, [{port, 0}], ProtoOpts), Port = ranch:get_port(Ref), [{type, tcp}, {protocol, http}, {port, Port}, {opts, []}|Config]. init_https(Ref, ProtoOpts, Config) -> Opts = ct_helper:get_certs_from_ets(), - {ok, _} = cowboy:start_tls(Ref, 100, Opts ++ [{port, 0}], ProtoOpts), + {ok, _} = cowboy:start_tls(Ref, Opts ++ [{port, 0}], ProtoOpts), Port = ranch:get_port(Ref), [{type, ssl}, {protocol, http}, {port, Port}, {opts, Opts}|Config]. init_http2(Ref, ProtoOpts, Config) -> Opts = ct_helper:get_certs_from_ets(), - {ok, _} = cowboy:start_tls(Ref, 100, Opts ++ [{port, 0}], ProtoOpts), + {ok, _} = cowboy:start_tls(Ref, Opts ++ [{port, 0}], ProtoOpts), Port = ranch:get_port(Ref), [{type, ssl}, {protocol, http2}, {port, Port}, {opts, Opts}|Config]. diff --git a/test/http2_SUITE.erl b/test/http2_SUITE.erl index 454c1a4..6eaa11d 100644 --- a/test/http2_SUITE.erl +++ b/test/http2_SUITE.erl @@ -49,7 +49,7 @@ inactivity_timeout(Config) -> env => #{dispatch => cowboy_router:compile(init_routes(Config))}, inactivity_timeout => 1000 }, - {ok, _} = cowboy:start_clear(Ref, 100, [{port, 0}], ProtoOpts), + {ok, _} = cowboy:start_clear(Ref, [{port, 0}], ProtoOpts), Port = ranch:get_port(Ref), SocketConfig = [{type, tcp}, {protocol, http}, {port, Port}, {opts, []}|Config], {ok, Socket} = do_handshake(SocketConfig), diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl index 1fa583a..e57e384 100644 --- a/test/http_SUITE.erl +++ b/test/http_SUITE.erl @@ -88,14 +88,14 @@ init_per_group(Name = https_compress, Config) -> }, Config); %% Most, if not all of these, should be in separate test suites. init_per_group(onresponse, Config) -> - {ok, _} = cowboy:start_clear(onresponse, 100, [{port, 0}], [ + {ok, _} = cowboy:start_clear(onresponse, [{port, 0}], [ {env, [{dispatch, init_dispatch(Config)}]}, {onresponse, fun do_onresponse_hook/4} ]), Port = ranch:get_port(onresponse), [{type, tcp}, {port, Port}, {opts, []}|Config]; init_per_group(onresponse_capitalize, Config) -> - {ok, _} = cowboy:start_clear(onresponse_capitalize, 100, [{port, 0}], [ + {ok, _} = cowboy:start_clear(onresponse_capitalize, [{port, 0}], [ {env, [{dispatch, init_dispatch(Config)}]}, {onresponse, fun do_onresponse_capitalize_hook/4} ]), @@ -107,13 +107,13 @@ init_per_group(parse_host, Config) -> {"/req_attr", http_req_attr, []} ]} ]), - {ok, _} = cowboy:start_clear(parse_host, 100, [{port, 0}], [ + {ok, _} = cowboy:start_clear(parse_host, [{port, 0}], [ {env, [{dispatch, Dispatch}]} ]), Port = ranch:get_port(parse_host), [{type, tcp}, {port, Port}, {opts, []}|Config]; init_per_group(set_env, Config) -> - {ok, _} = cowboy:start_clear(set_env, 100, [{port, 0}], [ + {ok, _} = cowboy:start_clear(set_env, [{port, 0}], [ {env, [{dispatch, []}]} ]), Port = ranch:get_port(set_env), diff --git a/test/ws_SUITE.erl b/test/ws_SUITE.erl index b127c7a..ad4e15e 100644 --- a/test/ws_SUITE.erl +++ b/test/ws_SUITE.erl @@ -38,7 +38,7 @@ init_per_group(Name = autobahn, Config) -> "http://autobahn.ws/testsuite/installation.html"), {skip, "Autobahn Test Suite not installed."}; _ -> - {ok, _} = cowboy:start_clear(Name, 100, [{port, 33080}], #{ + {ok, _} = cowboy:start_clear(Name, [{port, 33080}], #{ env => #{dispatch => init_dispatch()} }), Config -- cgit v1.2.3