From efededd6aa8be5ab054037ee32680a772d06a3c5 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 1 Dec 2015 12:41:58 -0500 Subject: Expect failures on these tests due to ASCII --- setuptools/tests/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'setuptools/tests/__init__.py') diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py index b8a29cba..a93be134 100644 --- a/setuptools/tests/__init__.py +++ b/setuptools/tests/__init__.py @@ -16,6 +16,10 @@ import setuptools.depends as dep from setuptools import Feature from setuptools.depends import Require +c_type = os.environ.get("LC_CTYPE", os.environ.get("LC_ALL")) +is_ascii = c_type in ("C", "POSIX") +fail_on_ascii = pytest.mark.xfail(is_ascii, "Test fails in this locale") + def makeSetup(**args): """Return distribution from 'setup(**args)', without executing commands""" -- cgit v1.2.1 From df2fad0435a7875bbbb2f91240754d85a8aebc1f Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 1 Dec 2015 12:45:10 -0500 Subject: Correct usage --- setuptools/tests/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setuptools/tests/__init__.py') diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py index a93be134..fed07628 100644 --- a/setuptools/tests/__init__.py +++ b/setuptools/tests/__init__.py @@ -18,7 +18,7 @@ from setuptools.depends import Require c_type = os.environ.get("LC_CTYPE", os.environ.get("LC_ALL")) is_ascii = c_type in ("C", "POSIX") -fail_on_ascii = pytest.mark.xfail(is_ascii, "Test fails in this locale") +fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale") def makeSetup(**args): """Return distribution from 'setup(**args)', without executing commands""" -- cgit v1.2.1 From 8e0ac92076007aa6e49f22029003b9618605c996 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 1 Dec 2015 14:07:15 -0500 Subject: Expect failure running Python 3 only tests on Python 2 --- setuptools/tests/__init__.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setuptools/tests/__init__.py') diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py index fed07628..f985a6e4 100644 --- a/setuptools/tests/__init__.py +++ b/setuptools/tests/__init__.py @@ -20,6 +20,7 @@ c_type = os.environ.get("LC_CTYPE", os.environ.get("LC_ALL")) is_ascii = c_type in ("C", "POSIX") fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale") + def makeSetup(**args): """Return distribution from 'setup(**args)', without executing commands""" -- cgit v1.2.1