From 961fc8d0971d2fe66e4b5bfc0eb12f1d93f65c70 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 26 Sep 2019 15:43:25 -0400
Subject: [PATCH] log output from get-passes and exercise-storage too
also if get-passes fails dump the tahoe logs
---
nixos/modules/tests/private-storage.nix | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/nixos/modules/tests/private-storage.nix b/nixos/modules/tests/private-storage.nix
index c37c9d55..5c44c755 100644
--- a/nixos/modules/tests/private-storage.nix
+++ b/nixos/modules/tests/private-storage.nix
@@ -122,9 +122,16 @@ import <nixpkgs/nixos/tests/make-test.nix> {
$client->waitForOpenPort(3456);
# Get some ZKAPs from the issuer.
- $client->succeed('${get-passes} http://127.0.0.1:3456 http://issuer');
+ eval {
+ $client->succeed('set -eo pipefail; ${get-passes} http://127.0.0.1:3456 http://issuer:8081 | systemd-cat');
+ } or do {
+ my $error = $@ || 'Unknown failure';
+ my ($code, $log) = $client->execute('cat /tmp/stdout /tmp/stderr');
+ $client->log($log);
+ die $@;
+ };
# The client should be prepped now. Make it try to use some storage.
- $client->succeed('${exercise-storage}');
+ $client->succeed('set -eo pipefail; ${exercise-storage} | systemd-cat');
'';
}
--
GitLab