[Python-checkins] r73914 - in python/branches/release26-maint: Lib/test/test_posix.py

[r.david.murray]

Author: r.david.murray
Date: Thu Jul  9 22:13:41 2009
New Revision: 73914

Log:
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).
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_posix.py

Modified: python/branches/release26-maint/Lib/test/test_posix.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_posix.py	(original)
+++ python/branches/release26-maint/Lib/test/test_posix.py	Thu Jul  9 22:13:41 2009
@@ -267,8 +267,8 @@
                 _create_and_do_getcwd(dirname)
 
             finally:
-                shutil.rmtree(base_path)
                 os.chdir(curdir)
+                shutil.rmtree(base_path)
 
 
 def test_main():