test: Mark some xfails based on if in docker instead of in CI

Makes them apply better in local docker runs.

Author: scop

test/t/conftest.py

@@ -344,6 +344,10 @@ def completion(request, bash: pexpect.spawn) -> CompletionResult:
     return assert_complete(bash, marker.args[0], **marker.kwargs)
 
 
+def in_docker() -> bool:
+    return os.path.exists("/.dockerenv")
+
+
 class TestUnitBase:
 
     def _test_unit(self, func, bash,

test/t/test_arp.py

@@ -1,12 +1,12 @@
-import os
-
 import pytest
 
+from conftest import in_docker
+
 
 class TestArp:
 
-    @pytest.mark.xfail(bool(os.environ.get("CI")),
-                       reason="Probably fails in CI")
+    @pytest.mark.xfail(in_docker(), reason="Probably fails in docker")
+    @pytest.mark.complete("arp ")
     def test_1(self, completion):
         assert completion.list
 

test/t/test_ifdown.py

@@ -1,12 +1,11 @@
-import os
-
 import pytest
 
+from conftest import in_docker
+
 
 class TestIfdown:
 
-    @pytest.mark.xfail(bool(os.environ.get("CI")),
-                       reason="Probably fails in CI")
+    @pytest.mark.xfail(in_docker(), reason="Probably fails in docker")
     @pytest.mark.complete("ifdown ")
     def test_1(self, completion):
         assert completion.list

test/t/test_ifup.py

@@ -1,12 +1,11 @@
-import os
-
 import pytest
 
+from conftest import in_docker
+
 
 class TestIfup:
 
-    @pytest.mark.xfail(bool(os.environ.get("CI")),
-                       reason="Probably fails in CI")
+    @pytest.mark.xfail(in_docker(), reason="Probably fails in docker")
     @pytest.mark.complete("ifup ")
     def test_1(self, completion):
         assert completion.list

test/t/test_make.py

@@ -2,6 +2,8 @@
 
 import pytest
 
+from conftest import in_docker
+
 
 class TestMake:
 
@@ -34,10 +36,9 @@ def test_6(self, bash, completion):
             "all clean extra_makefile install sample".split()
         os.remove("%s/make/%s" % (bash.cwd, "extra_makefile"))
 
-    @pytest.mark.xfail(
-        bool(os.environ.get("CI")) 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.xfail(in_docker() 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")
     def test_7(self, bash, completion):
         assert completion.list == ".1 .2".split()

test/t/test_man.py

@@ -2,6 +2,8 @@
 
 import pytest
 
+from conftest import in_docker
+
 
 @pytest.mark.bashcomp(ignore_env=r"^[+-]MANPATH=")
 class TestMan:
@@ -22,8 +24,7 @@ def test_2(self, completion):
     def test_3(self, completion):
         assert completion.list == ["man/quux.8"]
 
-    @pytest.mark.xfail(bool(os.environ.get("CI")) and
-                       os.environ.get("DIST") == "centos6",
+    @pytest.mark.xfail(in_docker() and os.environ.get("DIST") == "centos6",
                        reason="TODO: Fails in CentOS for some reason, unknown "
                        "how to trigger same behavior as tests show (is "
                        "different and correct when tried manually, but here "