Avoid uid/gid 0 metadata tests when ids don't exist

[bup.git] / t / test-rm-between-index-and-save.sh

diff --git a/t/test-rm-between-index-and-save.sh b/t/test-rm-between-index-and-save.sh
index ce03befd71d1134de5677fa8fa894c46546c71fb..ee0cd0ac31a2f0c868fd3db5584cc238592b3c72 100755 (executable)
--- a/t/test-rm-between-index-and-save.sh
+++ b/t/test-rm-between-index-and-save.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 . ./wvtest-bup.sh
 
+set -o pipefail
+
 top="$(WVPASS pwd)" || exit $?
 tmpdir="$(WVPASS wvmktempdir)" || exit $?
 export BUP_DIR="$tmpdir/bup"
@@ -27,7 +29,7 @@ WVPASS rm "$D"/foo
 WVPASS bup save -n save-fail-missing "$D"
 # when the save-call failed, foo is missing from output, since only
 # then bup notices, that it was removed:
-WVPASSEQ "$(bup ls -a save-fail-missing/latest/$TOP/$D/)" "bar
+WVPASSEQ "$(bup ls -A save-fail-missing/latest/$TOP/$D/)" "bar
 baz
 foo"
 # index/save again
@@ -35,7 +37,7 @@ WVPASS bup tick
 WVPASS bup index -ux "$D"
 WVPASS bup save -n save-fail-missing "$D"
 # now foo is gone:
-WVPASSEQ "$(bup ls -a save-fail-missing/latest/$TOP/$D/)" "bar
+WVPASSEQ "$(bup ls -A save-fail-missing/latest/$TOP/$D/)" "bar
 baz"
 
 
@@ -60,7 +62,7 @@ WVPASS rmdir "$D"/foo
 # (complete with delayed error)
 WVFAIL bup save -n save-fail-missing "$D"
 # ... so "foo" is absent from "bup ls"
-WVPASSEQ "$(bup ls -a save-fail-missing/latest/$TOP/$D/)" "bar/
+WVPASSEQ "$(bup ls -AF save-fail-missing/latest/$TOP/$D/)" "bar/
 baz/"
 # Index again:
 WVPASS bup tick
@@ -68,7 +70,7 @@ WVPASS bup index -ux "$D"
 # no non-zero-exitcode anymore:
 WVPASS bup save -n save-fail-missing "$D"
 # foo is (still...) missing, of course:
-WVPASSEQ "$(bup ls -a save-fail-missing/latest/$TOP/$D/)" "bar/
+WVPASSEQ "$(bup ls -AF save-fail-missing/latest/$TOP/$D/)" "bar/
 baz/"
 
 WVPASS rm -rf "$tmpdir"