aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-11-13 11:33:00 -0500
committerJason R. Coombs <jaraco@jaraco.com>2016-11-13 11:33:00 -0500
commit5d78aeb98a5d2b1c366421e68162d9d46de45502 (patch)
treef53597108b7ea790fd96925571580cc61a701d43
parent13838fb83aa4a9521ceff9715026e57b81894e74 (diff)
downloadexternal_python_setuptools-5d78aeb98a5d2b1c366421e68162d9d46de45502.tar.gz
external_python_setuptools-5d78aeb98a5d2b1c366421e68162d9d46de45502.tar.bz2
external_python_setuptools-5d78aeb98a5d2b1c366421e68162d9d46de45502.zip
Fix test failures on Python 2 and suppress test failures when PEP 420 is not available. Ref #805.
-rw-r--r--setuptools/tests/test_namespaces.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index f90c25cf..ad3c78b8 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -1,10 +1,12 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
import os
import textwrap
import sys
import subprocess
+import pytest
+
class TestNamespaces:
@staticmethod
@@ -46,6 +48,8 @@ class TestNamespaces:
tmpl = '__import__("site").addsitedir({target_str!r})'
sc.write_text(tmpl.format(**locals()), encoding='utf-8')
+ @pytest.mark.xfail(sys.version_info < (3, 3),
+ reason="Requires PEP 420")
def test_mixed_site_and_non_site(self, tmpdir):
"""
Installing two packages sharing the same namespace, one installed