Branch merge

3c9e9264 · Éric Araujo · 55ab37cb · aa066f5e · 3c9e9264
Commit 3c9e9264 authored Aug 26, 2011 by Éric Araujo
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

tests/support.py tests/support.py +4 -0

No files found.
--- a/tests/support.py
+++ b/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()