Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove unit test that triggers frequent intermittent failure.

Browse source
This commit is contained in:
Josh Matthews 2020-07-24 12:37:54 -04:00
parent 6ca3c84d28
commit 7775833b11
1 changed files with 2 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

80
components/net/tests/http_loader.rs
View file

@ -16,8 +16,7 @@ use flate2::Compression;
use futures::{self, Future, Stream}; use futures::{self, Future, Stream};
use headers::authorization::Basic; use headers::authorization::Basic;
use headers::{ use headers::{
AccessControlAllowOrigin, Authorization, ContentLength, Date, HeaderMapExt, Host, Origin, Authorization, ContentLength, Date, HeaderMapExt, Host, StrictTransportSecurity, UserAgent,
StrictTransportSecurity, UserAgent,
}; };
use http::header::{self, HeaderMap, HeaderValue}; use http::header::{self, HeaderMap, HeaderValue};
use http::uri::Authority; use http::uri::Authority;
@ -34,7 +33,7 @@ use net::resource_thread::AuthCacheEntry;
use net::test::replace_host_table; use net::test::replace_host_table;
use net_traits::request::{ use net_traits::request::{
BodyChunkRequest, BodyChunkResponse, BodySource, CredentialsMode, Destination, Referrer, BodyChunkRequest, BodyChunkResponse, BodySource, CredentialsMode, Destination, Referrer,
RequestBody, RequestBuilder, RequestMode, RequestBody, RequestBuilder,
}; };
use net_traits::response::ResponseBody; use net_traits::response::ResponseBody;
use net_traits::{CookieSource, NetworkError, ReferrerPolicy}; use net_traits::{CookieSource, NetworkError, ReferrerPolicy};
@ -1372,81 +1371,6 @@ fn test_auth_ui_needs_www_auth() {
); );
} }
#[test]
fn test_origin_set() {
let origin_header = Arc::new(Mutex::new(None));
let origin_header_clone = origin_header.clone();
let handler = move |request: HyperRequest<Body>, resp: &mut HyperResponse<Body>| {
let origin_header_clone = origin_header.clone();
resp.headers_mut()
.typed_insert(AccessControlAllowOrigin::ANY);
match request.headers().typed_get::<Origin>() {
None => assert_eq!(origin_header_clone.lock().unwrap().take(), None),
Some(h) => assert_eq!(h, origin_header_clone.lock().unwrap().take().unwrap()),
}
};
let (server, url) = make_server(handler);
let mut origin =
Origin::try_from_parts(url.scheme(), url.host_str().unwrap(), url.port()).unwrap();
*origin_header_clone.lock().unwrap() = Some(origin.clone());
let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
.method(Method::POST)
.body(None)
.origin(url.clone().origin())
.build();
let response = fetch(&mut request, None);
assert!(response
.internal_response
.unwrap()
.status
.unwrap()
.0
.is_success());
let origin_url = ServoUrl::parse("http://example.com").unwrap();
origin =
Origin::try_from_parts(origin_url.scheme(), origin_url.host_str().unwrap(), None).unwrap();
// Test Origin header is set on Get request with CORS mode
let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
.method(Method::GET)
.mode(RequestMode::CorsMode)
.body(None)
.origin(origin_url.clone().origin())
.build();
*origin_header_clone.lock().unwrap() = Some(origin.clone());
let response = fetch(&mut request, None);
assert!(response
.internal_response
.unwrap()
.status
.unwrap()
.0
.is_success());
// Test Origin header is not set on method Head
let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
.method(Method::HEAD)
.body(None)
.origin(url.clone().origin())
.build();
*origin_header_clone.lock().unwrap() = None;
let response = fetch(&mut request, None);
match response.internal_response.as_ref() {
Some(response) => {
assert!(response.status.as_ref().unwrap().0.is_success());
},
None => {
panic!("Expected internal response, got {:?}", response);
},
}
let _ = server.close();
}
#[test] #[test]
fn test_determine_requests_referrer_shorter_than_4k() { fn test_determine_requests_referrer_shorter_than_4k() {
let url_str = "http://username:password@example.com/such/short/referer?query#fragment"; let url_str = "http://username:password@example.com/such/short/referer?query#fragment";