Auto merge of #7884 - Manishearth:fx-openssl, r=Ms2ger

Update openssl and re-enable the resource task tests

https://github.com/sfackler/rust-openssl/issues/281 landed

r? @larsbergstrom

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7884)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-06 10:43:41 -06:00
commit 5730a8bdd1
4 changed files with 53 additions and 25 deletions

View file

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