From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 25 Aug 2011 16:32:02 +0000 (+0200)
Subject: Issue #12333: fix test_distutils failures under Solaris and derivatives
X-Git-Tag: v3.2.3rc1~614^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fc80b62ba8e6390019a50947daa03320c047bcd;p=thirdparty%2FPython%2Fcpython.git

Issue #12333: fix test_distutils failures under Solaris and derivatives
---

diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
index dc0e660e695b..44fcd6b7d844 100644
--- a/Lib/distutils/tests/support.py
+++ b/Lib/distutils/tests/support.py
@@ -54,9 +54,13 @@ class TempdirManager(object):
 
     def setUp(self):
         super().setUp()
+        self.old_cwd = os.getcwd()
         self.tempdirs = []
 
     def tearDown(self):
+        # Restore working dir, for Solaris and derivatives, where rmdir()
+        # on the current directory fails.
+        os.chdir(self.old_cwd)
         super().tearDown()
         while self.tempdirs:
             d = self.tempdirs.pop()