From 41deeb76fc88382f27b3d37cce75eda2c54cbc2a Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 8 Aug 2020 15:53:41 -0400
Subject: Bypass pytest-virtualenv due to bugs in 'run' command. Instead, use
 jaraco.envs.VirtualEnv and build a bespoke fixture with a run command.

---
 setup.cfg                                   |  1 +
 setuptools/tests/requirements.txt           |  1 +
 setuptools/tests/test_distutils_adoption.py | 48 ++++++++++++++++++-----------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 485714a3..87fa6bf2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -72,6 +72,7 @@ tests =
     paver; python_version>="3.6"
     futures; python_version=="2.7"
     pip>=19.1 # For proper file:// URLs support.
+    jaraco.envs
 
 docs =
     # Keep these in sync with docs/requirements.txt
diff --git a/setuptools/tests/requirements.txt b/setuptools/tests/requirements.txt
index 19bf5aef..d0d07f70 100644
--- a/setuptools/tests/requirements.txt
+++ b/setuptools/tests/requirements.txt
@@ -10,3 +10,4 @@ pytest-cov>=2.5.1
 paver; python_version>="3.6"
 futures; python_version=="2.7"
 pip>=19.1 # For proper file:// URLs support.
+jaraco.envs
diff --git a/setuptools/tests/test_distutils_adoption.py b/setuptools/tests/test_distutils_adoption.py
index a945a69f..476b0a9e 100644
--- a/setuptools/tests/test_distutils_adoption.py
+++ b/setuptools/tests/test_distutils_adoption.py
@@ -1,8 +1,27 @@
 import os
 import sys
 import functools
+import subprocess
 
 import pytest
+import jaraco.envs
+import path
+
+
+class VirtualEnv(jaraco.envs.VirtualEnv):
+    name = '.env'
+
+    def run(self, cmd, *args, **kwargs):
+        cmd = [self.exe(cmd[0])] + cmd[1:]
+        return subprocess.check_output(cmd, *args, cwd=self.root, **kwargs)
+
+
+@pytest.fixture
+def venv(tmpdir):
+    env = VirtualEnv()
+    env.root = path.Path(tmpdir)
+    env.req = os.getcwd()
+    return env.create()
 
 
 def popen_text(call):
@@ -13,36 +32,29 @@ def popen_text(call):
         if sys.version_info < (3, 7) else functools.partial(call, text=True)
 
 
-@pytest.fixture
-def env(virtualenv):
-    virtualenv.run(['pip', 'uninstall', '-y', 'setuptools'])
-    virtualenv.run(['pip', 'install', os.getcwd()])
-    return virtualenv
-
-
-def find_distutils(env, imports='distutils'):
+def find_distutils(venv, imports='distutils', **kwargs):
     py_cmd = 'import {imports}; print(distutils.__file__)'.format(**locals())
     cmd = ['python', '-c', py_cmd]
-    return popen_text(env.run)(cmd, capture=True)
+    return popen_text(venv.run)(cmd, **kwargs)
 
 
-def test_distutils_stdlib(env):
+def test_distutils_stdlib(venv):
     """
     Ensure stdlib distutils is used when appropriate.
     """
-    assert '.env' not in find_distutils(env).split(os.sep)
+    assert venv.name not in find_distutils(venv, env=dict()).split(os.sep)
 
 
-def test_distutils_local_with_setuptools(env):
+def test_distutils_local_with_setuptools(venv):
     """
     Ensure local distutils is used when appropriate.
     """
-    env.env.update(SETUPTOOLS_USE_DISTUTILS='local')
-    loc = find_distutils(env, imports='setuptools, distutils')
-    assert '.env' in loc.split(os.sep)
+    env = dict(SETUPTOOLS_USE_DISTUTILS='local')
+    loc = find_distutils(venv, imports='setuptools, distutils', env=env)
+    assert venv.name in loc.split(os.sep)
 
 
 @pytest.mark.xfail(reason="#2259")
-def test_distutils_local(env):
-    env.env.update(SETUPTOOLS_USE_DISTUTILS='local')
-    assert '.env' in find_distutils(env).split(os.sep)
+def test_distutils_local(venv):
+    env = dict(SETUPTOOLS_USE_DISTUTILS='local')
+    assert venv.name in find_distutils(venv, env=env).split(os.sep)
-- 
cgit v1.2.3