Commit a4eb194e authored by Antoine Pitrou's avatar Antoine Pitrou

Merge from 3.2

parents bfd5a32e ee429340
...@@ -170,6 +170,7 @@ import re ...@@ -170,6 +170,7 @@ import re
import io import io
import sys import sys
import time import time
import errno
import traceback import traceback
import warnings import warnings
import unittest import unittest
...@@ -1569,8 +1570,11 @@ def _make_temp_dir_for_build(TEMPDIR): ...@@ -1569,8 +1570,11 @@ def _make_temp_dir_for_build(TEMPDIR):
if sysconfig.is_python_build(): if sysconfig.is_python_build():
TEMPDIR = os.path.join(sysconfig.get_config_var('srcdir'), 'build') TEMPDIR = os.path.join(sysconfig.get_config_var('srcdir'), 'build')
TEMPDIR = os.path.abspath(TEMPDIR) TEMPDIR = os.path.abspath(TEMPDIR)
if not os.path.exists(TEMPDIR): try:
os.mkdir(TEMPDIR) os.mkdir(TEMPDIR)
except OSError as e:
if e.errno != errno.EEXIST:
raise
# Define a writable temp dir that will be used as cwd while running # Define a writable temp dir that will be used as cwd while running
# the tests. The name of the dir includes the pid to allow parallel # the tests. The name of the dir includes the pid to allow parallel
......
...@@ -475,6 +475,8 @@ Extensions ...@@ -475,6 +475,8 @@ Extensions
Tests Tests
----- -----
- Fix possible "file already exists" error when running the tests in parallel.
- Issue #11719: Fix message about unexpected test_msilib skip on non-Windows - Issue #11719: Fix message about unexpected test_msilib skip on non-Windows
platforms. Patch by Nadeem Vawda. platforms. Patch by Nadeem Vawda.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment