Remove tests reliant on pkg_resources, rather than xfailing them.

Author: jaraco

setuptools/tests/test_namespaces.py

@@ -1,15 +1,12 @@
 import subprocess
 import sys
 
-import pytest
-
 from setuptools._path import paths_on_pythonpath
 
 from . import namespaces
 
 
 class TestNamespaces:
-    @pytest.mark.xfail(reason="pkg_resources has been removed")
     def test_mixed_site_and_non_site(self, tmpdir):
         """
         Installing two packages sharing the same namespace, one installed
@@ -52,36 +49,6 @@ def test_mixed_site_and_non_site(self, tmpdir):
         with paths_on_pythonpath(map(str, targets)):
             subprocess.check_call(try_import)
 
-    @pytest.mark.xfail(reason="pkg_resources has been removed")
-    def test_pkg_resources_import(self, tmpdir):
-        """
-        Ensure that a namespace package doesn't break on import
-        of pkg_resources.
-        """
-        pkg = namespaces.build_namespace_package(tmpdir, 'myns.pkgA')
-        target = tmpdir / 'packages'
-        target.mkdir()
-        install_cmd = [
-            sys.executable,
-            '-m',
-            'pip',
-            'install',
-            '-t',
-            str(target),
-            str(pkg),
-        ]
-        with paths_on_pythonpath([str(target)]):
-            subprocess.check_call(install_cmd)
-        namespaces.make_site_dir(target)
-        try_import = [
-            sys.executable,
-            '-c',
-            'import pkg_resources',
-        ]
-        with paths_on_pythonpath([str(target)]):
-            subprocess.check_call(try_import)
-
-    @pytest.mark.xfail(reason="pkg_resources has been removed")
     def test_namespace_package_installed_and_cwd(self, tmpdir):
         """
         Installing a namespace packages but also having it in the current
@@ -102,43 +69,11 @@ def test_namespace_package_installed_and_cwd(self, tmpdir):
         subprocess.check_call(install_cmd)
         namespaces.make_site_dir(target)
 
-        # ensure that package imports and pkg_resources imports
+        # ensure that package imports
         pkg_resources_imp = [
             sys.executable,
             '-c',
-            'import pkg_resources; import myns.pkgA',
+            'import myns.pkgA',
         ]
         with paths_on_pythonpath([str(target)]):
             subprocess.check_call(pkg_resources_imp, cwd=str(pkg_A))
-
-    @pytest.mark.xfail(reason="pkg_resources has been removed")
-    def test_packages_in_the_same_namespace_installed_and_cwd(self, tmpdir):
-        """
-        Installing one namespace package and also have another in the same
-        namespace in the current working directory, both of them must be
-        importable.
-        """
-        pkg_A = namespaces.build_namespace_package(tmpdir, 'myns.pkgA')
-        pkg_B = namespaces.build_namespace_package(tmpdir, 'myns.pkgB')
-        target = tmpdir / 'packages'
-        # use pip to install to the target directory
-        install_cmd = [
-            sys.executable,
-            '-m',
-            'pip.__main__',
-            'install',
-            str(pkg_A),
-            '-t',
-            str(target),
-        ]
-        subprocess.check_call(install_cmd)
-        namespaces.make_site_dir(target)
-
-        # ensure that all packages import and pkg_resources imports
-        pkg_resources_imp = [
-            sys.executable,
-            '-c',
-            'import pkg_resources; import myns.pkgA; import myns.pkgB',
-        ]
-        with paths_on_pythonpath([str(target)]):
-            subprocess.check_call(pkg_resources_imp, cwd=str(pkg_B))