summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'patches/22_all_tests_environment.patch')
-rw-r--r--patches/22_all_tests_environment.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/22_all_tests_environment.patch b/patches/22_all_tests_environment.patch
index 5f8d80d..656f00b 100644
--- a/patches/22_all_tests_environment.patch
+++ b/patches/22_all_tests_environment.patch
@@ -132,7 +132,7 @@ https://bugs.python.org/issue1674555
except KeyboardInterrupt:
# print a newline separate from the ^C
print()
-@@ -1260,8 +1313,9 @@
+@@ -1261,8 +1314,9 @@
for name, get, restore in self.resource_info():
current = get()
original = saved_values.pop(name)
@@ -164,8 +164,8 @@ https://bugs.python.org/issue1674555
+
if site.ENABLE_USER_SITE and not os.path.isdir(site.USER_SITE):
# need to add user site directory for tests
- os.makedirs(site.USER_SITE)
-@@ -438,8 +443,11 @@
+ try:
+@@ -443,8 +448,11 @@
def test_startup_imports(self):
# This tests checks which modules are loaded by Python when it
# initially starts upon startup.
@@ -179,7 +179,7 @@ https://bugs.python.org/issue1674555
stdout, stderr = popen.communicate()
--- Makefile.pre.in
+++ Makefile.pre.in
-@@ -994,7 +994,7 @@
+@@ -1016,7 +1016,7 @@
######################################################################
TESTOPTS= $(EXTRATESTOPTS)