forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(client): replace default dispatcher

Browse Source
This commit is contained in:
Sean McArthur
2017-12-28 17:18:42 -08:00
parent 6fde13f759
commit 0892cb2777
3 changed files with 55 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/client.rs
View File

@@ -19,24 +19,13 @@ use futures::sync::oneshot;
use tokio_core::reactor::{Core, Handle};
fn client(handle: &Handle) -> Client<HttpConnector> {
let mut config = Client::configure();
if env("HYPER_NO_PROTO", "1") {
config = config.no_proto();
}
config.build(handle)
Client::new(handle)
}
fn s(buf: &[u8]) -> &str {
::std::str::from_utf8(buf).unwrap()
}
fn env(name: &str, val: &str) -> bool {
match ::std::env::var(name) {
Ok(var) => var == val,
Err(_) => false,
}
}
macro_rules! test {
(
name: $name:ident,
@@ -463,8 +452,7 @@ test! {
body: None,
proxy: false,
error: |err| match err {
&hyper::Error::Version if env("HYPER_NO_PROTO", "1") => true,
&hyper::Error::Io(_) if !env("HYPER_NO_PROTO", "1") => true,
&hyper::Error::Version => true,
_ => false,
},
@@ -606,7 +594,6 @@ mod dispatch_impl {
let closes = Arc::new(AtomicUsize::new(0));
let client = Client::configure()
.connector(DebugConnector(HttpConnector::new(1, &core.handle()), closes.clone()))
.no_proto()
.build(&handle);
let (tx1, rx1) = oneshot::channel();
@@ -666,7 +653,6 @@ mod dispatch_impl {
let res = {
let client = Client::configure()
.connector(DebugConnector(HttpConnector::new(1, &handle), closes.clone()))
.no_proto()
.build(&handle);
client.get(uri).and_then(move |res| {
assert_eq!(res.status(), hyper::StatusCode::Ok);
@@ -717,7 +703,6 @@ mod dispatch_impl {
let client = Client::configure()
.connector(DebugConnector(HttpConnector::new(1, &handle), closes.clone()))
.no_proto()
.build(&handle);
let res = client.get(uri).and_then(move |res| {
assert_eq!(res.status(), hyper::StatusCode::Ok);
@@ -767,7 +752,6 @@ mod dispatch_impl {
let res = {
let client = Client::configure()
.connector(DebugConnector(HttpConnector::new(1, &handle), closes.clone()))
.no_proto()
.build(&handle);
client.get(uri)
};
@@ -812,7 +796,6 @@ mod dispatch_impl {
let res = {
let client = Client::configure()
.connector(DebugConnector(HttpConnector::new(1, &handle), closes.clone()))
.no_proto()
.build(&handle);
// notably, havent read body yet
client.get(uri)
@@ -852,7 +835,6 @@ mod dispatch_impl {
let client = Client::configure()
.connector(DebugConnector(HttpConnector::new(1, &handle), closes.clone()))
.no_proto()
.keep_alive(false)
.build(&handle);
let res = client.get(uri).and_then(move |res| {
@@ -892,7 +874,6 @@ mod dispatch_impl {
let client = Client::configure()
.connector(DebugConnector(HttpConnector::new(1, &handle), closes.clone()))
.no_proto()
.build(&handle);
let res = client.get(uri).and_then(move |res| {
assert_eq!(res.status(), hyper::StatusCode::Ok);