vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Test: Show error output from hydra-queue-runner on timeout

Browse source
This commit is contained in:
Eelco Dolstra 2016-10-06 17:18:10 +02:00
parent 6a313c691b
commit f2724d088d
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/Hydra/Helper/Nix.pm
View file

@ -393,7 +393,7 @@ sub captureStdoutStderr {
if ($@) {
die unless $@ eq "timeout\n"; # propagate unexpected errors
return (-1, "", "timeout\n");
return (-1, $stdout, ($stderr // "") . "timeout\n");
} else {
return ($?, $stdout, $stderr);
}

4
tests/Setup.pm
View file

@ -72,6 +72,10 @@ sub evalSucceeds {
sub runBuild {
my ($build) = @_;
my ($res, $stdout, $stderr) = captureStdoutStderr(60, ("hydra-queue-runner", "-vvvv", "--build-one", $build->id));
if ($res) {
print STDERR "Queue runner stdout: $stdout\n" if $stdout ne "";
print STDERR "Queue runner stderr: $stderr\n" if $stderr ne "";
}
return !$res;
}