tests: fuse: use stat instead of relying on "ls -l" output

[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..67c5b8ad89c22f341c9c43f70f8a53c92a21a34e 100755 (executable)
--- a/t/test-rm-between-index-and-save.sh
+++ b/t/test-rm-between-index-and-save.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
-. ./wvtest-bup.sh
+. ./wvtest-bup.sh || exit $?
+
+set -o pipefail
 
 top="$(WVPASS pwd)" || exit $?
 tmpdir="$(WVPASS wvmktempdir)" || exit $?
@@ -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"
 
 
@@ -59,16 +61,17 @@ WVPASS rmdir "$D"/foo
 # with directories, bup notices that foo is missing, so it fails
 # (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/
-baz/"
+# ...but foo is still saved since it was just fine in the index
+WVPASSEQ "$(bup ls -AF save-fail-missing/latest/$TOP/$D/)" "bar/
+baz/
+foo/"
 # Index again:
 WVPASS bup tick
 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/
+# foo is now gone
+WVPASSEQ "$(bup ls -AF save-fail-missing/latest/$TOP/$D/)" "bar/
 baz/"
 
 WVPASS rm -rf "$tmpdir"