Adjust rm-cmd and bup.rm for python 3 and enable test-rm

[bup.git] / t / test-xdev.sh

diff --git a/t/test-xdev.sh b/t/test-xdev.sh
index 18530f674b6b635c85222e28b4c0f961f78e6c40..e9817062fdd5b2eda6a1558b151194a2dba81fe8 100755 (executable)
--- a/t/test-xdev.sh
+++ b/t/test-xdev.sh
@@ -1,17 +1,24 @@
 #!/usr/bin/env bash
-. ./wvtest-bup.sh
+. ./wvtest-bup.sh || exit $?
 
 set -o pipefail
 
-if [ $(t/root-status) != root ]; then
-    echo 'Not root: skipping xdev tests.'
+root_status="$(t/root-status)" || exit $?
+
+if [ "$root_status" != root ]; then
+    WVSTART 'not root: skipping tests'
     exit 0 # FIXME: add WVSKIP.
 fi
 
+if ! modprobe loop; then
+    WVSTART 'unable to load loopback module; skipping tests' 1>&2
+    exit 0
+fi
+
 # These tests are only likely to work under Linux for now
 # (patches welcome).
 if ! [[ $(uname) =~ Linux ]]; then
-    echo 'Not Linux: skipping xdev tests.'
+    WVSTART 'not Linux: skipping tests'
     exit 0 # FIXME: add WVSKIP.
 fi
 
@@ -28,21 +35,39 @@ WVPASS pushd "$tmpdir"
 
 WVSTART 'drecurse'
 
-WVPASS dd if=/dev/zero of=testfs.img bs=1M count=32
-WVPASS mkfs -F testfs.img # Don't care what type.
-WVPASS mkdir -p src/mnt/{a,b,c}
-WVPASS mount -o loop testfs.img src/mnt
-WVPASS mkdir -p src/mnt/x
-WVPASS touch src/1 src/mnt/2 src/mnt/x/3
-
-WVPASSEQ "$(bup drecurse src | grep -vF lost+found)" "src/mnt/x/3
-src/mnt/x/
-src/mnt/2
-src/mnt/
+WVPASS dd if=/dev/zero of=testfs-1.img bs=1M count=32
+WVPASS dd if=/dev/zero of=testfs-2.img bs=1M count=32
+WVPASS mkfs -F testfs-1.img # Don't care what type (though must have symlinks)
+WVPASS mkfs -F testfs-2.img # Don't care what type (though must have symlinks)
+WVPASS mkdir -p src/mnt-1/hidden-1 src/mnt-2/hidden-2
+WVPASS mount -o loop testfs-1.img src/mnt-1
+WVPASS mount -o loop testfs-2.img src/mnt-2
+
+WVPASS touch src/1
+
+WVPASS mkdir -p src/mnt-1/x
+WVPASS touch src/mnt-1/2 src/mnt-1/x/3
+
+WVPASS touch src/mnt-2/4
+
+(WVPASS cd src && WVPASS ln -s mnt-2 mnt-link)
+(WVPASS cd src && WVPASS ln -s . top)
+
+WVPASSEQ "$(bup drecurse src | grep -vF lost+found)" "src/top
+src/mnt-link
+src/mnt-2/4
+src/mnt-2/
+src/mnt-1/x/3
+src/mnt-1/x/
+src/mnt-1/2
+src/mnt-1/
 src/1
 src/"
 
-WVPASSEQ "$(bup drecurse -x src)" "src/mnt/
+WVPASSEQ "$(bup drecurse -x src)" "src/top
+src/mnt-link
+src/mnt-2/
+src/mnt-1/
 src/1
 src/"
 
@@ -55,6 +80,7 @@ WVPASS bup restore -C src-restore "/src/latest$(pwd)/"
 WVPASS test -d src-restore/src
 WVPASS "$top/t/compare-trees" -c src/ src-restore/src/
 
+# Test -x when none of the mount points are explicitly indexed
 WVPASS rm -r "$BUP_DIR" src-restore
 WVPASS bup init
 WVPASS bup index -x src
@@ -62,10 +88,69 @@ WVPASS bup save -n src src
 WVPASS mkdir src-restore
 WVPASS bup restore -C src-restore "/src/latest$(pwd)/"
 WVPASS test -d src-restore/src
-WVPASSEQ "$(cd src-restore/src && find . -not -name lost+found | sort)" ".
+WVPASSEQ "$(cd src-restore/src && find . -not -name lost+found | LC_ALL=C sort)" \
+".
+./1
+./mnt-1
+./mnt-2
+./mnt-link
+./top"
+
+# Test -x when a mount point is explicitly indexed.  This should
+# include the mount.
+WVPASS rm -r "$BUP_DIR" src-restore
+WVPASS bup init
+WVPASS bup index -x src src/mnt-2
+WVPASS bup save -n src src
+WVPASS mkdir src-restore
+WVPASS bup restore -C src-restore "/src/latest$(pwd)/"
+WVPASS test -d src-restore/src
+WVPASSEQ "$(cd src-restore/src && find . -not -name lost+found | LC_ALL=C sort)" \
+".
+./1
+./mnt-1
+./mnt-2
+./mnt-2/4
+./mnt-link
+./top"
+
+# Test -x when a direct link to a mount point is explicitly indexed.
+# This should *not* include the mount.
+WVPASS rm -r "$BUP_DIR" src-restore
+WVPASS bup init
+WVPASS bup index -x src src/mnt-link
+WVPASS bup save -n src src
+WVPASS mkdir src-restore
+WVPASS bup restore -C src-restore "/src/latest$(pwd)/"
+WVPASS test -d src-restore/src
+WVPASSEQ "$(cd src-restore/src && find . -not -name lost+found | LC_ALL=C sort)" \
+".
+./1
+./mnt-1
+./mnt-2
+./mnt-link
+./top"
+
+# Test -x when a path that resolves to a mount point is explicitly
+# indexed (i.e. dir symlnks that redirect the leaf to a mount point).
+# This should include the mount.
+WVPASS rm -r "$BUP_DIR" src-restore
+WVPASS bup init
+WVPASS bup index -x src src/top/top/mnt-2
+WVPASS bup save -n src src
+WVPASS mkdir src-restore
+WVPASS bup restore -C src-restore "/src/latest$(pwd)/"
+WVPASS test -d src-restore/src
+WVPASSEQ "$(cd src-restore/src && find . -not -name lost+found | LC_ALL=C sort)" \
+".
 ./1
-./mnt"
+./mnt-1
+./mnt-2
+./mnt-2/4
+./mnt-link
+./top"
 
-WVPASS popd
-WVPASS umount "$tmpdir/src/mnt"
+WVPASS cd "$top"
+WVPASS umount "$tmpdir/src/mnt-1"
+WVPASS umount "$tmpdir/src/mnt-2"
 WVPASS rm -r "$tmpdir"