From: Jesus Cea <jcea@jcea.es>
Date: Fri, 9 Sep 2011 16:50:59 +0000 (+0200)
Subject: Issue #12333: fix test_distutils failures under Solaris and derivatives. Patch by... 
X-Git-Tag: v2.7.3rc1~463
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6072d86758e1d199b50ecb647d81d2b12396955;p=thirdparty%2FPython%2Fcpython.git

Issue #12333: fix test_distutils failures under Solaris and derivatives. Patch by Antoine Pitrou
---

diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
index 648a8e415638..a2190c0214fd 100644
--- a/Lib/distutils/tests/support.py
+++ b/Lib/distutils/tests/support.py
@@ -63,9 +63,13 @@ class TempdirManager(object):
 
     def setUp(self):
         super(TempdirManager, self).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(TempdirManager, self).tearDown()
         while self.tempdirs:
             d = self.tempdirs.pop()