From 5d78aeb98a5d2b1c366421e68162d9d46de45502 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 13 Nov 2016 11:33:00 -0500
Subject: Fix test failures on Python 2 and suppress test failures when PEP 420
 is not available. Ref #805.

---
 setuptools/tests/test_namespaces.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'setuptools/tests')

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
-- 
cgit v1.2.3