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/http_SUITE_data/rest_missing_callbacks.erl | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 test/http_SUITE_data/rest_missing_callbacks.erl (limited to 'test/http_SUITE_data/rest_missing_callbacks.erl') diff --git a/test/http_SUITE_data/rest_missing_callbacks.erl b/test/http_SUITE_data/rest_missing_callbacks.erl deleted file mode 100644 index bf77c22..0000000 --- a/test/http_SUITE_data/rest_missing_callbacks.erl +++ /dev/null @@ -1,24 +0,0 @@ --module(rest_missing_callbacks). - --export([init/2]). --export([allowed_methods/2]). --export([content_types_accepted/2]). --export([content_types_provided/2]). - -init(Req, Opts) -> - {cowboy_rest, Req, Opts}. - -allowed_methods(Req, State) -> - {[<<"GET">>, <<"PUT">>], Req, State}. - -content_types_accepted(Req, State) -> - ct_helper_error_h:ignore(cowboy_rest, process_content_type, 3), - {[ - {<<"application/json">>, put_application_json} - ], Req, State}. - -content_types_provided(Req, State) -> - ct_helper_error_h:ignore(cowboy_rest, set_resp_body, 2), - {[ - {<<"text/plain">>, get_text_plain} - ], Req, State}. -- cgit v1.2.3