Teach pytest to handle WVSKIP and use it where we can

[bup.git] / test / ext / test-meta

diff --git a/test/ext/test-meta b/test/ext/test-meta
index 0f8bb6054c8303bf39842bd466786e8fb46e4a07..4d6b86aaed94de96a506745b2dc94a7d22e66fb1 100755 (executable)
--- a/test/ext/test-meta
+++ b/test/ext/test-meta
@@ -160,8 +160,8 @@ WVSTART 'metadata save/restore (general)'
     # Test a deeper subdir/ to make sure top-level non-dir metadata is
     # restored correctly.  We need at least one dir and one non-dir at
     # the "top-level".
-    WVPASS test -d src/var/cmd
-    WVPASS test -f src/var/cmd/save-cmd.py
+    WVPASS test -d src/var/lib/bup
+    WVPASS test -f src/var/lib/bup/git.py
     WVPASS rm -rf "$BUP_DIR"
     WVPASS bup init
     WVPASS touch -t 201111111111 src-restore # Make sure the top won't match.
@@ -640,7 +640,7 @@ if [ "$root_status" = root ]; then
 
         if ! modprobe loop; then
             echo 'Unable to load loopback module; skipping dependent tests.' 1>&2
-            exit 0
+            exit 0 # FIXME: allow intermixed WVSKIPs
         fi
 
         testfs="$(WVPASS wvmkmountpt)" || exit $?