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

Merge pull request #132 from NixOS/clarify-partial-log

Browse source 
Clarify partial log
This commit is contained in:
Graham Christensen 2018-03-18 16:15:55 -04:00 committed by GitHub
parent fefc1ec984 29fadfaa4b
commit b46eea0b50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ofborg/src/nix.rs
View file

@ -291,6 +291,15 @@ mod tests {
Fail,
}
fn lines_from_file(file: File) -> Vec<String> {
BufReader::new(file)
.lines()
.into_iter()
.filter(|line| line.is_ok())
.map(|line| line.unwrap())
.collect()
}
fn assert_run(res: Result<File, File>, expected: Expect, require: Vec<&str>) {
let expectation_held: bool = match expected {
Expect::Pass => res.is_ok(),
@ -302,12 +311,7 @@ mod tests {
Err(file) => file,
};
let lines: Vec<String> = BufReader::new(file)
.lines()
.into_iter()
.filter(|line| line.is_ok())
.map(|line| line.unwrap())
.collect();
let lines = lines_from_file(file);
let buildlog = lines
.into_iter()

4
ofborg/src/tasks/githubcommentposter.rs
View file

@ -113,7 +113,7 @@ fn result_to_comment(result: &BuildResult) -> String {
if result.output.len() > 0 {
reply.extend(partial_log_segment(&result.output));
} else {
reply.push("No log is available.".to_owned());
reply.push("No partial log is available.".to_owned());
reply.push("".to_owned());
}
@ -416,7 +416,7 @@ patching script interpreter paths in /nix/store/pcja75y9isdvgz5i00pkrpif9rxzxc29
The following builds were skipped because they don't evaluate on x86_64-linux: not-attempted
No log is available.
No partial log is available.
"
);
}