From 228cebaf04f2c53b0bf09fb69b52be543cfc55ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Tue, 5 May 2015 19:59:37 +0300 Subject: Add rfc7230 test suite and update others to recent Gun This is a large commit. The rfc7230 test suite adds many tests from the RFC7230 document. Gun has been updated quite a bit recently, which broke the Cowboy suites. This is now fixed with this commit. A new hook onfirstrequest has been added. It was very useful during debugging of the test suites. The initial process code has changed a little; more changes are expected with the switch to maps for options. --- test/http_SUITE_data/http_errors.erl | 4 ++-- test/http_SUITE_data/rest_missing_callbacks.erl | 4 ++-- test/http_SUITE_data/rest_resource_etags.erl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'test/http_SUITE_data') diff --git a/test/http_SUITE_data/http_errors.erl b/test/http_SUITE_data/http_errors.erl index f646df5..ee5c2b2 100644 --- a/test/http_SUITE_data/http_errors.erl +++ b/test/http_SUITE_data/http_errors.erl @@ -9,9 +9,9 @@ init(Req, _Opts) -> case_init(Case, Req). case_init(<<"init_before_reply">> = Case, _Req) -> - cowboy_error_h:ignore(?MODULE, case_init, 2), + ct_helper_error_h:ignore(?MODULE, case_init, 2), error(Case); case_init(<<"init_after_reply">> = Case, Req) -> - cowboy_error_h:ignore(?MODULE, case_init, 2), + ct_helper_error_h:ignore(?MODULE, case_init, 2), _ = cowboy_req:reply(200, [], "http_handler_crashes", Req), error(Case). diff --git a/test/http_SUITE_data/rest_missing_callbacks.erl b/test/http_SUITE_data/rest_missing_callbacks.erl index e1fcac1..bf77c22 100644 --- a/test/http_SUITE_data/rest_missing_callbacks.erl +++ b/test/http_SUITE_data/rest_missing_callbacks.erl @@ -12,13 +12,13 @@ allowed_methods(Req, State) -> {[<<"GET">>, <<"PUT">>], Req, State}. content_types_accepted(Req, State) -> - cowboy_error_h:ignore(cowboy_rest, process_content_type, 3), + ct_helper_error_h:ignore(cowboy_rest, process_content_type, 3), {[ {<<"application/json">>, put_application_json} ], Req, State}. content_types_provided(Req, State) -> - cowboy_error_h:ignore(cowboy_rest, set_resp_body, 2), + ct_helper_error_h:ignore(cowboy_rest, set_resp_body, 2), {[ {<<"text/plain">>, get_text_plain} ], Req, State}. diff --git a/test/http_SUITE_data/rest_resource_etags.erl b/test/http_SUITE_data/rest_resource_etags.erl index 0585761..25b3080 100644 --- a/test/http_SUITE_data/rest_resource_etags.erl +++ b/test/http_SUITE_data/rest_resource_etags.erl @@ -23,10 +23,10 @@ generate_etag(Req, State) -> {<<"\"etag-header-value\"">>, Req, State}; %% Invalid return values from generate_etag/2. <<"binary-strong-unquoted">> -> - cowboy_error_h:ignore(cow_http_hd, parse_etag, 1), + ct_helper_error_h:ignore(cow_http_hd, parse_etag, 1), {<<"etag-header-value">>, Req, State}; <<"binary-weak-unquoted">> -> - cowboy_error_h:ignore(cow_http_hd, parse_etag, 1), + ct_helper_error_h:ignore(cow_http_hd, parse_etag, 1), {<<"W/etag-header-value">>, Req, State} end. -- cgit v1.2.3