From 191ce95ca1304d33fb712ab2eff079cf2e8b61ee Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 20 May 2020 15:57:10 +0000
Subject: [PATCH] admin-test: Show err.txt on unexpected failure

In a CI run I think one of these `ostree show` commands is failing.
While that output would be useful, the actual `err.txt` usually
has what we want too.
---
 tests/admin-test.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/admin-test.sh b/tests/admin-test.sh
index c716d0a5..54b93321 100644
--- a/tests/admin-test.sh
+++ b/tests/admin-test.sh
@@ -306,8 +306,7 @@ prev_rev=$(${CMD_PREFIX} ostree rev-parse --repo=sysroot/ostree/repo testos/buil
 assert_not_streq ${head_rev} ${prev_rev}
 # check that we can't "upgrade" to an older commit without --allow-downgrade
 if ${CMD_PREFIX} ostree admin upgrade --os=testos --override-commit=${prev_rev} 2> err.txt; then
-    ${CMD_PREFIX} ostree --repo=sysroot/ostree/repo show "${prev_rev}"
-    ${CMD_PREFIX} ostree --repo=sysroot/ostree/repo show "${head_rev}"
+    cat err.txt
     fatal "downgraded without --allow-downgrade?"
 fi
 assert_file_has_content err.txt "Upgrade.*is chronologically older"