admin-test: Show err.txt on unexpected failure
authorColin Walters <walters@verbum.org>
Wed, 20 May 2020 15:57:10 +0000 (15:57 +0000)
committerColin Walters <walters@verbum.org>
Wed, 20 May 2020 15:57:10 +0000 (15:57 +0000)
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

index c716d0a52a575331cbd47ff0344d260029892ea3..54b93321f2b647e4f1b6aed1413775b49196aa07 100644 (file)
@@ -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"