Also save the ENABLE_USER_SITE setting in the user_override.

2 files changed, 12 insertions, 1 deletions

diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index a9626ae6..1620bdb3 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -3,6 +3,7 @@ import os
 import shutil
 import sys
 import contextlib
+import site
 
 from ..compat import StringIO
 
@@ -57,3 +58,12 @@ def quiet():
         new_stderr.seek(0)
         sys.stdout = old_stdout
         sys.stderr = old_stderr
+
+
+@contextlib.contextmanager
+def save_user_site_setting():
+    saved = site.ENABLE_USER_SITE
+    try:
+        yield saved
+    finally:
+        site.ENABLE_USER_SITE = saved
diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
index 6b0e53f3..225c2ea3 100644
--- a/setuptools/tests/fixtures.py
+++ b/setuptools/tests/fixtures.py
@@ -13,4 +13,5 @@ def user_override():
         with mock.patch('site.USER_BASE', user_base):
             with contexts.tempdir() as user_site:
                 with mock.patch('site.USER_SITE', user_site):
-                    yield
+                    with contexts.save_user_site_setting():
+                        yield