From: R. David Murray <rdmurray@bitdance.com>
Date: Thu, 9 Jul 2009 20:13:41 +0000 (+0000)
Subject: Merged revisions 73907-73908 via svnmerge from
X-Git-Tag: v2.6.3rc1~156
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8bb57b734008cc82e6d001b712154a1a6d21fda5;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 73907-73908 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73907 | r.david.murray | 2009-07-09 12:17:30 -0400 (Thu, 09 Jul 2009) | 4 lines

  Temporarily ignore rmtree errors in test_getcwd_long_pathnames to see
  if the test gives useful failure info on Solaris buildbot.
........
  r73908 | r.david.murray | 2009-07-09 14:41:03 -0400 (Thu, 09 Jul 2009) | 6 lines

  Try to fix Solaris buildbot rmtree failure in test_getcwd_long_pathnames
  cleanup.  If this fix works, it means that Solaris is unique among
  our platforms in what happens when shutil.rmtree is called on the
  current working directory (ie: it doesn't work on Solaris, but
  it does everywhere else).
........
---

diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index 5f40060a6b52..09294851fb93 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -267,8 +267,8 @@ class PosixTester(unittest.TestCase):
                 _create_and_do_getcwd(dirname)
 
             finally:
-                shutil.rmtree(base_path)
                 os.chdir(curdir)
+                shutil.rmtree(base_path)
 
 
 def test_main():