diff options
author | Bastien Orivel <eijebong@bananium.fr> | 2018-11-07 19:48:07 +0100 |
---|---|---|
committer | Bastien Orivel <eijebong@bananium.fr> | 2018-11-18 19:33:19 +0100 |
commit | 9a7eeb349a8aa657e063665ac92387ab8ef3ce28 (patch) | |
tree | 63c5aa1ba7cd7fdb1bf14bcc9cbb6e6c0e24431b /components/net/tests/fetch.rs | |
parent | 76195e0779469f29a5e27cd882e2bbe8b2c9d6dd (diff) | |
download | servo-9a7eeb349a8aa657e063665ac92387ab8ef3ce28.tar.gz servo-9a7eeb349a8aa657e063665ac92387ab8ef3ce28.zip |
Update crossbeam-channel to 0.3
Diffstat (limited to 'components/net/tests/fetch.rs')
-rw-r--r-- | components/net/tests/fetch.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/components/net/tests/fetch.rs b/components/net/tests/fetch.rs index 5183c8d8ff4..a61b8a7178e 100644 --- a/components/net/tests/fetch.rs +++ b/components/net/tests/fetch.rs @@ -9,6 +9,7 @@ use crate::{ create_embedder_proxy, fetch, make_server, make_ssl_server, new_fetch_context, DEFAULT_USER_AGENT, }; +use crossbeam_channel::{unbounded, Sender}; use devtools_traits::HttpRequest as DevtoolsHttpRequest; use devtools_traits::HttpResponse as DevtoolsHttpResponse; use headers_core::HeaderMapExt; @@ -37,7 +38,6 @@ use net_traits::response::{CacheState, Response, ResponseBody, ResponseType}; use net_traits::IncludeSubdomains; use net_traits::NetworkError; use net_traits::ReferrerPolicy; -use servo_channel::{channel, Sender}; use servo_url::{ImmutableOrigin, ServoUrl}; use std::fs::File; use std::io::Read; @@ -891,7 +891,7 @@ fn test_fetch_redirect_updates_method_runner( #[test] fn test_fetch_redirect_updates_method() { - let (tx, rx) = channel(); + let (tx, rx) = unbounded(); test_fetch_redirect_updates_method_runner( tx.clone(), @@ -901,17 +901,17 @@ fn test_fetch_redirect_updates_method() { assert_eq!(rx.recv().unwrap(), true); assert_eq!(rx.recv().unwrap(), true); // make sure the test doesn't send more data than expected - assert_eq!(rx.try_recv().is_none(), true); + assert_eq!(rx.try_recv().is_err(), true); test_fetch_redirect_updates_method_runner(tx.clone(), StatusCode::FOUND, Method::POST); assert_eq!(rx.recv().unwrap(), true); assert_eq!(rx.recv().unwrap(), true); - assert_eq!(rx.try_recv().is_none(), true); + assert_eq!(rx.try_recv().is_err(), true); test_fetch_redirect_updates_method_runner(tx.clone(), StatusCode::SEE_OTHER, Method::GET); assert_eq!(rx.recv().unwrap(), true); assert_eq!(rx.recv().unwrap(), true); - assert_eq!(rx.try_recv().is_none(), true); + assert_eq!(rx.try_recv().is_err(), true); let extension = Method::from_bytes(b"FOO").unwrap(); @@ -923,18 +923,18 @@ fn test_fetch_redirect_updates_method() { assert_eq!(rx.recv().unwrap(), true); // for MovedPermanently and Found, Method should only be changed if it was Post assert_eq!(rx.recv().unwrap(), false); - assert_eq!(rx.try_recv().is_none(), true); + assert_eq!(rx.try_recv().is_err(), true); test_fetch_redirect_updates_method_runner(tx.clone(), StatusCode::FOUND, extension.clone()); assert_eq!(rx.recv().unwrap(), true); assert_eq!(rx.recv().unwrap(), false); - assert_eq!(rx.try_recv().is_none(), true); + assert_eq!(rx.try_recv().is_err(), true); test_fetch_redirect_updates_method_runner(tx.clone(), StatusCode::SEE_OTHER, extension.clone()); assert_eq!(rx.recv().unwrap(), true); // for SeeOther, Method should always be changed, so this should be true assert_eq!(rx.recv().unwrap(), true); - assert_eq!(rx.try_recv().is_none(), true); + assert_eq!(rx.try_recv().is_err(), true); } fn response_is_done(response: &Response) -> bool { @@ -1044,7 +1044,7 @@ fn test_fetch_with_devtools() { let mut request = Request::new(url.clone(), Some(origin), Some(TEST_PIPELINE_ID)); request.referrer = Referrer::NoReferrer; - let (devtools_chan, devtools_port) = channel(); + let (devtools_chan, devtools_port) = unbounded(); let _ = fetch(&mut request, Some(devtools_chan)); let _ = server.close(); |