mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
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:
commit
5730a8bdd1
4 changed files with 53 additions and 25 deletions
|
@ -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();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue