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_make.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'test/t/test_make.py') diff --git a/test/t/test_make.py b/test/t/test_make.py index e6e043cd..19861b00 100644 --- a/test/t/test_make.py +++ b/test/t/test_make.py @@ -2,21 +2,19 @@ import os import pytest -from conftest import in_container - class TestMake: @pytest.mark.complete("make -f Ma", cwd="make") def test_1(self, completion): - assert completion == "Makefile" + assert completion == "kefile" - @pytest.mark.complete("make .", cwd="make") + @pytest.mark.complete("make .", cwd="make", require_cmd=True) def test_2(self, bash, completion): """Hidden targets.""" assert completion == ".cache/ .test_passes".split() os.remove("%s/make/%s" % (bash.cwd, "extra_makefile")) - @pytest.mark.complete("make .cache/", cwd="make") + @pytest.mark.complete("make .cache/", cwd="make", require_cmd=True) def test_3(self, bash, completion): assert completion == "1 2".split() os.remove("%s/make/%s" % (bash.cwd, "extra_makefile")) @@ -29,22 +27,17 @@ class TestMake: def test_5(self, completion): assert completion - @pytest.mark.complete("make ", cwd="make") + @pytest.mark.complete("make ", cwd="make", require_cmd=True) def test_6(self, bash, completion): assert completion == "all clean extra_makefile install sample".split() os.remove("%s/make/%s" % (bash.cwd, "extra_makefile")) - @pytest.mark.xfail( - in_container() and os.environ.get("DIST") == "centos6", - reason="Fails for some unknown reason on CentOS 6, " - "even though the behavior appears to be correct", - ) - @pytest.mark.complete("make .cache/.", cwd="make") + @pytest.mark.complete("make .cache/.", cwd="make", require_cmd=True) def test_7(self, bash, completion): assert completion == ".1 .2".split() os.remove("%s/make/%s" % (bash.cwd, "extra_makefile")) - @pytest.mark.complete("make -C make ") + @pytest.mark.complete("make -C make ", require_cmd=True) def test_8(self, bash, completion): assert completion == "all clean extra_makefile install sample".split() os.remove("%s/make/%s" % (bash.cwd, "extra_makefile")) -- cgit v1.2.1