diff options
| author | Loïc Hoguin <[email protected]> | 2012-01-23 07:23:44 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2012-01-23 07:37:49 +0100 |
| commit | b650ef8907355bc0223c2e7412e36c1a07cb0173 (patch) | |
| tree | 08866d287798acbb60605746534fca2b09f3bda7 /test/http_SUITE.erl | |
| parent | e68bbfac3455d4062c414cc0d3a785a80c4ac148 (diff) | |
| parent | 528507c7decb2bf2fcbb55a47256011c2ce4bd4b (diff) | |
| download | cowboy-b650ef8907355bc0223c2e7412e36c1a07cb0173.tar.gz cowboy-b650ef8907355bc0223c2e7412e36c1a07cb0173.tar.bz2 cowboy-b650ef8907355bc0223c2e7412e36c1a07cb0173.zip | |
Merge branch 'multipart' of https://github.com/nox/cowboy
Conflicts:
src/cowboy_http_req.erl
test/http_SUITE.erl
Diffstat (limited to 'test/http_SUITE.erl')
| -rw-r--r-- | test/http_SUITE.erl | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl index 002ac4d..22ebb51 100644 --- a/test/http_SUITE.erl +++ b/test/http_SUITE.erl @@ -1,4 +1,5 @@ %% Copyright (c) 2011, Loïc Hoguin <[email protected]> +%% Copyright (c) 2011, Anthony Ramine <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above @@ -23,7 +24,7 @@ pipeline/1, raw/1, set_resp_header/1, set_resp_overwrite/1, set_resp_body/1, stream_body_set_resp/1, response_as_req/1, static_mimetypes_function/1, static_attribute_etag/1, - static_function_etag/1]). %% http. + static_function_etag/1, multipart/1]). %% http. -export([http_200/1, http_404/1, handler_errors/1, file_200/1, file_403/1, dir_403/1, file_404/1, file_400/1]). %% http and https. @@ -43,7 +44,7 @@ groups() -> set_resp_header, set_resp_overwrite, set_resp_body, response_as_req, stream_body_set_resp, static_mimetypes_function, static_attribute_etag, - static_function_etag] ++ BaseTests}, + static_function_etag, multipart] ++ BaseTests}, {https, [], BaseTests}, {misc, [], [http_10_hostless]}, {rest, [], [rest_simple, rest_keepalive]}]. @@ -144,6 +145,7 @@ init_http_dispatch(Config) -> {[<<"static_function_etag">>, '...'], cowboy_http_static, [{directory, ?config(static_dir, Config)}, {etag, {fun static_function_etag/2, etag_data}}]}, + {[<<"multipart">>], http_handler_multipart, []}, {[], http_handler, []} ]} ]. @@ -236,6 +238,24 @@ max_keepalive_loop(Socket, N) -> end, keepalive_nl_loop(Socket, N - 1). +multipart(Config) -> + Url = build_url("/multipart", Config), + Body = << + "This is a preamble." + "\r\n--OHai\r\nX-Name:answer\r\n\r\n42" + "\r\n--OHai\r\nServer:Cowboy\r\n\r\nIt rocks!\r\n" + "\r\n--OHai--" + "This is an epiloque." + >>, + Request = {Url, [], "multipart/x-makes-no-sense; boundary=OHai", Body}, + {ok, {{"HTTP/1.1", 200, "OK"}, _Headers, Response}} = + httpc:request(post, Request, [], [{body_format, binary}]), + Parts = binary_to_term(Response), + Parts = [ + {[{<<"X-Name">>, <<"answer">>}], <<"42">>}, + {[{'Server', <<"Cowboy">>}], <<"It rocks!\r\n">>} + ]. + nc_rand(Config) -> nc_reqs(Config, "/dev/urandom"). |