Expose IO.ic and IO.oc types for Cohttp_async. #271
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| (* | ||
| * Copyright (c) 2013 Anil Madhavapeddy <anil@recoil.org> | ||
| * | ||
| * Permission to use, copy, modify, and distribute this software for | ||
| * any purpose with or without fee is hereby granted, provided that the | ||
| * above copyright notice and this permission notice appear in all | ||
| * copies. THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS | ||
| * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED | ||
| * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE | ||
| * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL | ||
| * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA | ||
| * OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER | ||
| * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR | ||
| * PERFORMANCE OF THIS SOFTWARE. | ||
| *) | ||
|
|
||
| open Async.Std | ||
|
|
||
| include Cohttp.S.IO | ||
| with type 'a t = 'a Deferred.t | ||
| and type ic = Reader.t | ||
| and type oc = Writer.t |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| (* | ||
| * Copyright (c) 2015 Daniel Patterson <dbp@dbpmail.net> | ||
| * | ||
| * Permission to use, copy, modify, and distribute this software for any | ||
| * purpose with or without fee is hereby granted, provided that the above | ||
| * copyright notice and this permission notice appear in all copies. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
| * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
| * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
| * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
| * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
| * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
| * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
| * | ||
| *) | ||
|
|
||
| open OUnit | ||
| open Printf | ||
|
|
||
| let post_req = | ||
| "POST /path/script.cgi HTTP/1.0 | ||
| From: frog@jmarshall.com | ||
| User-Agent: HTTPTool/1.0 | ||
| Content-Type: application/x-www-form-urlencoded | ||
| Content-Length: 32 | ||
|
|
||
| home=Cosby&favorite+flavor=flies" | ||
|
|
||
|
|
||
| open Core.Std | ||
| open Async.Std | ||
|
|
||
| let ic_of_buffer buf = Reader.of_pipe (Info.of_string "") (Pipe.of_list [buf]) | ||
|
|
||
| let p_sexp f x = x |> f |> Sexplib.Sexp.to_string | ||
|
|
||
| let post_form_parse () = | ||
| let open Cohttp_async in | ||
| ic_of_buffer post_req >>= fun ic -> | ||
| Request.read ic >>= function | ||
| | `Ok req -> | ||
| assert_equal true (Request.is_form req); | ||
| Request.read_form req ic >>= fun params -> | ||
| assert_equal ["Cosby"] (List.Assoc.find_exn params "home"); | ||
| assert_equal ["flies"] (List.Assoc.find_exn params "favorite flavor"); | ||
| assert_raises Not_found (fun () -> List.Assoc.find_exn params "nonexistent"); | ||
| (* multiple requests should still work *) | ||
| assert_equal ["Cosby"] (List.Assoc.find_exn params "home"); | ||
| return () | ||
| | _ -> assert false | ||
|
|
||
| let test_cases = | ||
| let tests = [ | ||
| "post_form_parse", post_form_parse; | ||
| ] in | ||
| List.map ~f:(fun (n,x) -> n >:: (fun () -> Thread_safe.block_on_async_exn x)) tests | ||
|
|
||
| (* Returns true if the result list contains successes only. | ||
| Copied from oUnit source as it isnt exposed by the mli *) | ||
| let rec was_successful = | ||
| function | ||
| | [] -> true | ||
| | RSuccess _::t | ||
| | RSkip _::t -> | ||
| was_successful t | ||
| | RFailure _::_ | ||
| | RError _::_ | ||
| | RTodo _::_ -> | ||
| false | ||
|
|
||
| let _ = | ||
|
Member
There was a problem hiding this comment. I don't see you kicking off the async scheduler so I'm a little surprised this works.
Contributor
Author
There was a problem hiding this comment. @rgrinberg Per the docs, "block_on_async will automatically start the scheduler if it isn't already running." |
||
| let suite = "Parser" >::: test_cases in | ||
| let verbose = ref false in | ||
| let set_verbose _ = verbose := true in | ||
| Arg.parse | ||
| [("-verbose", Arg.Unit set_verbose, "Run the test in verbose mode.");] | ||
| (fun x -> raise (Arg.Bad ("Bad argument : " ^ x))) | ||
| ("Usage: " ^ Sys.argv.(0) ^ " [-verbose]"); | ||
| if not (was_successful (run_test_tt ~verbose:!verbose suite)) then | ||
| Pervasives.exit 1 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@avsm Why exactly do we need to copy this boilerplate everywhere. Can't we just
run_test_tt_main?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think back when I did this, Async didn't kick off the scheduler right. It should just be replaceable with
run_test_tt_mainnow