New upstream version 2.10upstream/2.10

1 files changed, 19 insertions, 7 deletions

diff --git a/test/t/test_mr.py b/test/t/test_mr.py
index ab45350b..768e1b35 100644
--- a/test/t/test_mr.py
+++ b/test/t/test_mr.py
@@ -9,35 +9,47 @@ class TestMr:
     # man -h tests below: Some mr versions require man to be around in order
     # to provide useful output.
 
-    @pytest.mark.complete("mr --", skipif="! man -h &>/dev/null")
+    @pytest.mark.complete(
+        "mr --", require_cmd=True, xfail="! man -h &>/dev/null"
+    )
     def test_2(self, completion):
         assert completion
 
     @pytest.mark.complete(
-        "mr -c shared/default/foo.d/", skipif="! man -h &>/dev/null"
+        "mr -c shared/default/foo.d/", xfail="! man -h &>/dev/null"
     )
     def test_3(self, completion):
         assert completion == "shared/default/foo.d/foo"
 
     @pytest.mark.complete(
-        "mr bootstrap shared/default/", skipif="! man -h &>/dev/null"
+        "mr bootstrap shared/default/",
+        require_cmd=True,
+        xfail="! man -h &>/dev/null",
     )
     def test_4(self, completion):
         assert completion == ["bar", "bar bar.d/", "foo", "foo.d/"]
 
     @pytest.mark.xfail  # "clean" doesn't exist before mr 1.20141023
-    @pytest.mark.complete("mr clean -", skipif="! man -h &>/dev/null")
+    @pytest.mark.complete(
+        "mr clean -", require_cmd=True, xfail="! man -h &>/dev/null"
+    )
     def test_5(self, completion):
         assert completion == "-f"
 
-    @pytest.mark.complete("mr commit -", skipif="! man -h &>/dev/null")
+    @pytest.mark.complete(
+        "mr commit -", require_cmd=True, xfail="! man -h &>/dev/null"
+    )
     def test_6(self, completion):
         assert completion == "-m"
 
-    @pytest.mark.complete("mr status ", skipif="! man -h &>/dev/null")
+    @pytest.mark.complete(
+        "mr status ", require_cmd=True, xfail="! man -h &>/dev/null"
+    )
     def test_7(self, completion):
         assert not completion
 
-    @pytest.mark.complete("mr run ", skipif="! man -h &>/dev/null")
+    @pytest.mark.complete(
+        "mr run ", require_cmd=True, xfail="! man -h &>/dev/null"
+    )
     def test_8(self, completion):
         assert completion