summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-07-09 20:13:41 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-07-09 20:13:41 (GMT)
commit8bb57b734008cc82e6d001b712154a1a6d21fda5 (patch)
tree0385b2af6a37f95856cefc608fdf66cea1d60aa1
parent597ef90183066af12ff7ebdcb04ac718d08ff292 (diff)
downloadcpython-8bb57b734008cc82e6d001b712154a1a6d21fda5.zip
cpython-8bb57b734008cc82e6d001b712154a1a6d21fda5.tar.gz
cpython-8bb57b734008cc82e6d001b712154a1a6d21fda5.tar.bz2
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). ........
-rw-r--r--Lib/test/test_posix.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index 5f40060..0929485 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():