diff options
author | Éric Araujo <merwok@netwok.org> | 2011-08-26 14:30:22 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-08-26 14:30:22 (GMT) |
commit | 2f24fda1959891238ceee4fc8c10844902b3092f (patch) | |
tree | c8fa0e8bd5684b137c4c081f9c8ebc4f6507165d | |
parent | 77443824f5ca8dea420e678668f55a6c73c27216 (diff) | |
parent | 4fc80b62ba8e6390019a50947daa03320c047bcd (diff) | |
download | cpython-2f24fda1959891238ceee4fc8c10844902b3092f.zip cpython-2f24fda1959891238ceee4fc8c10844902b3092f.tar.gz cpython-2f24fda1959891238ceee4fc8c10844902b3092f.tar.bz2 |
Branch merge
-rw-r--r-- | Lib/distutils/tests/support.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py index dc0e660..44fcd6b 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() |