From 95623d39d6029ba78ec96ad5ea08e9ac12629b91 Mon Sep 17 00:00:00 2001 From: "Gabriel F. T. Gomes" Date: Mon, 3 Aug 2020 18:43:13 -0300 Subject: New upstream version 2.11 --- test/t/test_mr.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'test/t/test_mr.py') diff --git a/test/t/test_mr.py b/test/t/test_mr.py index 768e1b35..bfad643f 100644 --- a/test/t/test_mr.py +++ b/test/t/test_mr.py @@ -19,7 +19,7 @@ class TestMr: "mr -c shared/default/foo.d/", xfail="! man -h &>/dev/null" ) def test_3(self, completion): - assert completion == "shared/default/foo.d/foo" + assert completion == "foo" @pytest.mark.complete( "mr bootstrap shared/default/", @@ -29,18 +29,21 @@ class TestMr: 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 -", require_cmd=True, xfail="! man -h &>/dev/null" + "mr clean -", + require_cmd=True, + xfail="! man -h &>/dev/null", + # "clean" does not exist before mr 1.20141023 + skipif="! mr help 2>&1 | command grep -qwF clean", ) def test_5(self, completion): - assert completion == "-f" + assert completion == "f" @pytest.mark.complete( "mr commit -", require_cmd=True, xfail="! man -h &>/dev/null" ) def test_6(self, completion): - assert completion == "-m" + assert completion == "m" @pytest.mark.complete( "mr status ", require_cmd=True, xfail="! man -h &>/dev/null" -- cgit v1.2.1