From f2724d088d2e64b446b0c5b59a8794734cab8926 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 6 Oct 2016 17:18:10 +0200
Subject: [PATCH] Test: Show error output from hydra-queue-runner on timeout

---
 src/lib/Hydra/Helper/Nix.pm | 2 +-
 tests/Setup.pm              | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib/Hydra/Helper/Nix.pm b/src/lib/Hydra/Helper/Nix.pm
index cba34cc4..958da4d1 100644
--- a/src/lib/Hydra/Helper/Nix.pm
+++ b/src/lib/Hydra/Helper/Nix.pm
@@ -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);
     }
diff --git a/tests/Setup.pm b/tests/Setup.pm
index 209d950d..9985cca2 100644
--- a/tests/Setup.pm
+++ b/tests/Setup.pm
@@ -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;
 }