Teach pytest to handle WVSKIP and use it where we can

[bup.git] / test / ext / conftest.py

diff --git a/test/ext/conftest.py b/test/ext/conftest.py
index a79d03374f6cdefe60042a58e193aa160d5026d7..2c8f03e8e9d45dd00cea7ebd26bd6ea2c320b625 100644 (file)
--- a/test/ext/conftest.py
+++ b/test/ext/conftest.py
@@ -28,7 +28,12 @@ class BupSubprocTestRunner(pytest.Item):
         out = p.communicate()[0]
         sys.stdout.flush()
         byte_stream(sys.stdout).write(out)
-        failures = [line for line in out.splitlines()
+        lines = out.splitlines()
+        for line in lines:
+            if line.startswith(b'!') and line.lower().endswith(b' skip ok'):
+                pytest.skip(line.decode('ascii'))
+                return
+        failures = [line for line in lines
                     if (line.startswith(b'!')
                         and line.lower().endswith(b' failed'))]
         if failures or p.returncode != 0: