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

Auto merge of #5742 - marcusklaas:issue-5718, r=jdm

Browse source 
This closes issue https://github.com/servo/servo/issues/5718.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5742)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-04-19 10:10:57 -05:00
commit f164cc253e
8 changed files with 28 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/unit/net/data_loader.rs
View file

@ -4,7 +4,7 @@
extern crate hyper;
use net_traits::ResponseSenders::Channel;
use net_traits::LoadConsumer::Channel;
use net_traits::LoadData;
use net_traits::ProgressMsg::{Payload, Done};
use self::hyper::header::ContentType;

8
tests/unit/net/image_cache_task.rs
View file

@ -7,7 +7,7 @@ use net_traits::image_cache_task::ImageResponseMsg::*;
use net_traits::image_cache_task::Msg::*;
use net::resource_task::{start_sending, ProgressSender};
use net_traits::{ControlMsg, Metadata, ResourceTask, ResponseSenders};
use net_traits::{ControlMsg, Metadata, ResourceTask};
use net_traits::image_cache_task::{ImageCacheTask, ImageCacheTaskClient, ImageResponseMsg, Msg};
use net_traits::ProgressMsg::{Payload, Done};
use profile::time;
@ -111,7 +111,7 @@ fn mock_resource_task<T: Closure + Send + 'static>(on_load: Box<T>) -> ResourceT
loop {
match port.recv().unwrap() {
ControlMsg::Load(_, consumer) => {
let chan = start_sending(ResponseSenders::from_consumer(consumer), Metadata::default(
let chan = start_sending(consumer, Metadata::default(
Url::parse("file:///fake").unwrap()));
on_load.invoke(chan);
}
@ -281,7 +281,7 @@ fn should_not_request_image_from_resource_task_if_image_is_already_available() {
loop {
match port.recv().unwrap() {
ControlMsg::Load(_, consumer) => {
let chan = start_sending(ResponseSenders::from_consumer(consumer), Metadata::default(
let chan = start_sending(consumer, Metadata::default(
Url::parse("file:///fake").unwrap()));
chan.send(Payload(test_image_bin())).unwrap();
chan.send(Done(Ok(()))).unwrap();
@ -330,7 +330,7 @@ fn should_not_request_image_from_resource_task_if_image_fetch_already_failed() {
loop {
match port.recv().unwrap() {
ControlMsg::Load(_, consumer) => {
let chan = start_sending(ResponseSenders::from_consumer(consumer), Metadata::default(
let chan = start_sending(consumer, Metadata::default(
Url::parse("file:///fake").unwrap()));
chan.send(Payload(test_image_bin())).unwrap();
chan.send(Done(Err("".to_string()))).unwrap();