aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2017-12-11 17:43:02 +0100
committerLoïc Hoguin <[email protected]>2017-12-11 17:43:02 +0100
commit01e13c0846a15a1f18ac586b68a6b9e6feb5c692 (patch)
tree1c4f56a82c5fea3019395de2b54bbd5cf7a4cf55
parent388a68fc2e8766138e4fefae86e52724b098c12e (diff)
downloadcowboy-01e13c0846a15a1f18ac586b68a6b9e6feb5c692.tar.gz
cowboy-01e13c0846a15a1f18ac586b68a6b9e6feb5c692.tar.bz2
cowboy-01e13c0846a15a1f18ac586b68a6b9e6feb5c692.zip
Fix how we require HTTP/1.0 from Gun in rfc7231_SUITE
-rw-r--r--test/cowboy_test.erl3
-rw-r--r--test/rfc7231_SUITE.erl5
2 files changed, 4 insertions, 4 deletions
diff --git a/test/cowboy_test.erl b/test/cowboy_test.erl
index f130451..0c02868 100644
--- a/test/cowboy_test.erl
+++ b/test/cowboy_test.erl
@@ -112,8 +112,7 @@ gun_open(Config, Opts) ->
retry => 0,
transport => config(type, Config),
transport_opts => proplists:get_value(transport_opts, Config, []),
- protocols => [config(protocol, Config)],
- http_opts => proplists:get_value(http_opts, Config, #{})
+ protocols => [config(protocol, Config)]
}),
ConnPid.
diff --git a/test/rfc7231_SUITE.erl b/test/rfc7231_SUITE.erl
index 5b5adeb..fac9903 100644
--- a/test/rfc7231_SUITE.erl
+++ b/test/rfc7231_SUITE.erl
@@ -19,6 +19,7 @@
-import(ct_helper, [config/2]).
-import(ct_helper, [doc/1]).
-import(cowboy_test, [gun_open/1]).
+-import(cowboy_test, [gun_open/2]).
-import(cowboy_test, [raw_open/1]).
-import(cowboy_test, [raw_send/2]).
-import(cowboy_test, [raw_recv_head/1]).
@@ -241,7 +242,7 @@ do_http10_expect(Config) ->
doc("A server that receives a 100-continue expectation "
"in an HTTP/1.0 request must ignore it. (RFC7231 5.1.1)"),
Body = <<"hello=world">>,
- ConnPid = gun_open([{http_opts, #{version => 'HTTP/1.0'}}|Config]),
+ ConnPid = gun_open(Config, #{http_opts => #{version => 'HTTP/1.0'}}),
Ref = gun:post(ConnPid, "/echo/read_body", [
{<<"accept-encoding">>, <<"gzip">>},
{<<"content-type">>, <<"application/x-www-form-urlencoded">>},
@@ -437,7 +438,7 @@ http10_status_code_101(Config) ->
end.
do_http10_status_code_1xx(StatusCode, Config) ->
- ConnPid = gun_open([{http_opts, #{version => 'HTTP/1.0'}}|Config]),
+ ConnPid = gun_open(Config, #{http_opts => #{version => 'HTTP/1.0'}}),
Ref = gun:get(ConnPid, "/resp/inform2/" ++ integer_to_list(StatusCode), [
{<<"accept-encoding">>, <<"gzip">>}
]),