aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/image_cache_task.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/net/image_cache_task.rs')
-rw-r--r--components/net/image_cache_task.rs31
1 files changed, 27 insertions, 4 deletions
diff --git a/components/net/image_cache_task.rs b/components/net/image_cache_task.rs
index f94da999a9f..fa8d189c943 100644
--- a/components/net/image_cache_task.rs
+++ b/components/net/image_cache_task.rs
@@ -555,6 +555,13 @@ mod tests {
}
fn mock_resource_task<T: Closure+Send>(on_load: Box<T>) -> ResourceTask {
+ let cookie_chan = spawn_listener(move |port: Receiver<resource_task::ControlMsg>| {
+ loop {
+ match port.recv() {
+ _ => { continue }
+ }
+ }
+ });
spawn_listener(move |port: Receiver<resource_task::ControlMsg>| {
loop {
match port.recv().unwrap() {
@@ -565,9 +572,10 @@ mod tests {
eventual_consumer: response.consumer.clone(),
};
let chan = start_sending(senders, Metadata::default(
- Url::parse("file:///fake").unwrap()));
+ Url::parse("file:///fake", cookie_chan.clone()).unwrap()));
on_load.invoke(chan);
}
+ resource_task::ControlMsg::Cookies(_) => {}
resource_task::ControlMsg::Exit => break
}
}
@@ -710,6 +718,13 @@ mod tests {
let (image_bin_sent_chan, image_bin_sent) = channel();
let (resource_task_exited_chan, resource_task_exited) = channel();
+ let cookie_chan = spawn_listener(move |port: Receiver<resource_task::ControlMsg>| {
+ loop {
+ match port.recv() {
+ _ => { continue }
+ }
+ }
+ });
let mock_resource_task = spawn_listener(move |port: Receiver<resource_task::ControlMsg>| {
loop {
@@ -721,11 +736,12 @@ mod tests {
eventual_consumer: response.consumer.clone(),
};
let chan = start_sending(senders, Metadata::default(
- Url::parse("file:///fake").unwrap()));
+ Url::parse("file:///fake").unwrap()), cookie_chan.clone());
chan.send(Payload(test_image_bin()));
chan.send(Done(Ok(())));
image_bin_sent_chan.send(());
}
+ resource_task::ControlMsg::Cookies(_) => {}
resource_task::ControlMsg::Exit => {
resource_task_exited_chan.send(());
break
@@ -762,7 +778,13 @@ mod tests {
let (image_bin_sent_chan, image_bin_sent) = channel();
let (resource_task_exited_chan, resource_task_exited) = channel();
-
+ let cookie_chan = spawn_listener(move |port: Receiver<resource_task::ControlMsg>| {
+ loop {
+ match port.recv() {
+ _ => { continue }
+ }
+ }
+ });
let mock_resource_task = spawn_listener(move |port: Receiver<resource_task::ControlMsg>| {
loop {
match port.recv().unwrap() {
@@ -773,11 +795,12 @@ mod tests {
eventual_consumer: response.consumer.clone(),
};
let chan = start_sending(senders, Metadata::default(
- Url::parse("file:///fake").unwrap()));
+ Url::parse("file:///fake").unwrap()), cookie_chan.clone());
chan.send(Payload(test_image_bin()));
chan.send(Done(Err("".to_string())));
image_bin_sent_chan.send(());
}
+ resource_task::ControlMsg::Cookies(_) => {}
resource_task::ControlMsg::Exit => {
resource_task_exited_chan.send(());
break