From 5964273cc4354b7378b8bdf49fe455d2b46d7c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 26 Mar 2018 18:49:09 +0200 Subject: Fix the flushing of messages when switching to Websocket We now flush messages that are specific to cowboy_http only. Stream handlers should also flush their own specific messages if necessary, although timeouts will be flushed regardless of where they originate from. Also renames the http_SUITE to old_http_SUITE to distinguish new tests from old tests. Most old tests need to be removed or converted eventually as they're legacy tests from Cowboy 1.0. --- test/old_http_SUITE_data/rest_resource_etags.erl | 37 ++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 test/old_http_SUITE_data/rest_resource_etags.erl (limited to 'test/old_http_SUITE_data/rest_resource_etags.erl') diff --git a/test/old_http_SUITE_data/rest_resource_etags.erl b/test/old_http_SUITE_data/rest_resource_etags.erl new file mode 100644 index 0000000..25b3080 --- /dev/null +++ b/test/old_http_SUITE_data/rest_resource_etags.erl @@ -0,0 +1,37 @@ +-module(rest_resource_etags). + +-export([init/2]). +-export([generate_etag/2]). +-export([content_types_provided/2]). +-export([get_text_plain/2]). + +init(Req, Opts) -> + {cowboy_rest, Req, Opts}. + +generate_etag(Req, State) -> + #{type := Type} = cowboy_req:match_qs([type], Req), + case Type of + %% Correct return values from generate_etag/2. + <<"tuple-weak">> -> + {{weak, <<"etag-header-value">>}, Req, State}; + <<"tuple-strong">> -> + {{strong, <<"etag-header-value">>}, Req, State}; + %% Backwards compatible return values from generate_etag/2. + <<"binary-weak-quoted">> -> + {<<"W/\"etag-header-value\"">>, Req, State}; + <<"binary-strong-quoted">> -> + {<<"\"etag-header-value\"">>, Req, State}; + %% Invalid return values from generate_etag/2. + <<"binary-strong-unquoted">> -> + ct_helper_error_h:ignore(cow_http_hd, parse_etag, 1), + {<<"etag-header-value">>, Req, State}; + <<"binary-weak-unquoted">> -> + ct_helper_error_h:ignore(cow_http_hd, parse_etag, 1), + {<<"W/etag-header-value">>, Req, State} + end. + +content_types_provided(Req, State) -> + {[{{<<"text">>, <<"plain">>, []}, get_text_plain}], Req, State}. + +get_text_plain(Req, State) -> + {<<"This is REST!">>, Req, State}. -- cgit v1.2.3