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

Auto merge of #7837 - larsbergstrom:rustup_20151002, r=Manishearth

Browse source 
Rust upgrade to nightly 20151002

r? @Manishearth

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7837)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-05 10:23:44 -06:00
commit 375382a2e8
9 changed files with 57 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/unit/net/resource_task.rs
View file

@ -11,13 +11,16 @@ use std::collections::HashMap;
use std::sync::mpsc::channel;
use url::Url;
#[test]
// Disabled, per https://github.com/sfackler/rust-openssl/issues/281
//#[test]
fn test_exit() {
let resource_task = new_resource_task("".to_owned(), None);
resource_task.send(ControlMsg::Exit).unwrap();
}
#[test]
// Disabled, per https://github.com/sfackler/rust-openssl/issues/281
//#[test]
fn test_bad_scheme() {
let resource_task = new_resource_task("".to_owned(), None);
let (start_chan, start) = ipc::channel().unwrap();