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

Auto merge of #16288 - nox:net, r=jdm

Browse source 
Kill ResourceGroup

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16288)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-07 05:53:31 -05:00 • committed by GitHub
commit 8f2ceb41dd
8 changed files with 55 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/unit/net/fetch.rs
View file

@ -23,7 +23,7 @@ use hyper::status::StatusCode;
use hyper::uri::RequestUri;
use hyper_openssl;
use msg::constellation_msg::TEST_PIPELINE_ID;
use net::connector::{create_http_connector, create_ssl_client};
use net::connector::create_ssl_client;
use net::fetch::cors_cache::CorsCache;
use net::fetch::methods::FetchContext;
use net::filemanager_thread::FileManager;
@ -532,14 +532,12 @@ fn test_fetch_with_hsts() {
let ca_file = resources_dir_path().unwrap().join("self_signed_certificate_for_testing.crt");
let ssl_client = create_ssl_client(&ca_file);
let connector = create_http_connector(ssl_client);
let context = FetchContext {
state: Arc::new(HttpState::new()),
state: Arc::new(HttpState::new(ssl_client)),
user_agent: DEFAULT_USER_AGENT.into(),
devtools_chan: None,
filemanager: FileManager::new(),
connector: connector,
};
{

4
tests/unit/net/lib.rs
View file

@ -56,13 +56,11 @@ struct FetchResponseCollector {
fn new_fetch_context(dc: Option<Sender<DevtoolsControlMsg>>) -> FetchContext {
let ca_file = resources_dir_path().unwrap().join("certs");
let ssl_client = create_ssl_client(&ca_file);
let connector = create_http_connector(ssl_client);
FetchContext {
state: Arc::new(HttpState::new()),
state: Arc::new(HttpState::new(ssl_client)),
user_agent: DEFAULT_USER_AGENT.into(),
devtools_chan: dc,
filemanager: FileManager::new(),
connector: connector,
}
}
impl FetchTaskTarget for FetchResponseCollector {