Teach pytest to handle WVSKIP and use it where we can

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

diff --git a/test/ext/test-xdev b/test/ext/test-xdev
index 78861a998f0a9e1915b5e9aa4a81b0563d686fc3..cc5a2c0802c512f92e95563f85923dfe4abbe2c4 100755 (executable)
--- a/test/ext/test-xdev
+++ b/test/ext/test-xdev
@@ -6,20 +6,20 @@ set -o pipefail
 root_status="$(dev/root-status)" || exit $?
 
 if [ "$root_status" != root ]; then
-    WVSTART 'not root: skipping tests'
-    exit 0 # FIXME: add WVSKIP.
+    WVSKIP 'not root: skipping tests'
+    exit 0
 fi
 
 if ! modprobe loop; then
-    WVSTART 'unable to load loopback module; skipping tests' 1>&2
+    WVSKIP 'unable to load loopback module; skipping tests'
     exit 0
 fi
 
 # These tests are only likely to work under Linux for now
 # (patches welcome).
 if ! [[ $(uname) =~ Linux ]]; then
-    WVSTART 'not Linux: skipping tests'
-    exit 0 # FIXME: add WVSKIP.
+    WVSKIP 'not Linux: skipping tests'
+    exit 0
 fi
 
 top="$(WVPASS pwd)" || exit $?