the-distro/ofborg
2
0
Fork 1
Code Issues 5 Pull requests 1 Projects Releases Packages Wiki Activity

Drop Finished messages on the floor

Browse source
This commit is contained in:
Graham Christensen 2018-03-10 18:59:19 -05:00
parent 4f9258c3b6
commit bb1f62b4fe
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ofborg/src/tasks/build.rs
View file

@ -492,7 +492,8 @@ mod tests {
assert_contains_job(&mut actions, "output\":\"2");
assert_contains_job(&mut actions, "output\":\"3");
assert_contains_job(&mut actions, "output\":\"4");
assert_contains_job(&mut actions, "success\":true");
assert_contains_job(&mut actions, "success\":true"); // First one to the github poster
assert_contains_job(&mut actions, "success\":true"); // This one to the logs
assert_eq!(actions.next(), Some(worker::Action::Ack));
}
@ -533,7 +534,8 @@ mod tests {
println!("Total actions: {:?}", dummyreceiver.actions.len());
let mut actions = dummyreceiver.actions.into_iter();
assert_contains_job(&mut actions, "skipped_attrs\":[\"not-real");
assert_contains_job(&mut actions, "skipped_attrs\":[\"not-real"); // First one to the github poster
assert_contains_job(&mut actions, "skipped_attrs\":[\"not-real"); // This one to the logs
assert_eq!(actions.next(), Some(worker::Action::Ack));
}
}

12
ofborg/src/tasks/log_message_collector.rs
View file

@ -207,7 +207,9 @@ impl worker::SimpleWorker for LogMessageCollector {
handle.write_to_line((message.line_number - 1) as usize,
&message.output);
}
},
MsgType::Finish(ref _finish) => {
},
}
return vec![worker::Action::Ack];
@ -343,7 +345,7 @@ mod tests {
};
let mut job = LogMessage {
from: make_from("foo"),
message: Right(logmsg.clone()),
message: MsgType::Msg(logmsg.clone()),
};
let p = TestScratch::new_dir("log-message-collector-path_for_log");
@ -354,7 +356,7 @@ mod tests {
worker.consumer(&
LogMessage {
from: make_from("foo"),
message: Left(BuildLogStart {
message: MsgType::Start(BuildLogStart {
attempt_id: String::from("my-attempt-id"),
identity: String::from("my-identity"),
system: String::from("foobar-x8664"),
@ -369,14 +371,14 @@ mod tests {
logmsg.line_number = 5;
logmsg.output = String::from("line-5");
job.message = Right(logmsg.clone());
job.message = MsgType::Msg(logmsg.clone());
assert_eq!(vec![worker::Action::Ack], worker.consumer(&job));
job.from.attempt_id = String::from("my-other-attempt");
logmsg.attempt_id = String::from("my-other-attempt");
logmsg.line_number = 3;
logmsg.output = String::from("line-3");
job.message = Right(logmsg.clone());
job.message = MsgType::Msg(logmsg.clone());
assert_eq!(vec![worker::Action::Ack], worker.consumer(&job));
}