summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-07-09 20:31:08 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-07-09 20:31:08 (GMT)
commit28a6001a021452bf26f58463be33ed4868cd1902 (patch)
tree48ea82871138ea07d2b25dbf144b4874cdc92cc8 /Lib
parent1f03fb7a18f4dc18f292a4db7b8a9fab7176294a (diff)
downloadcpython-28a6001a021452bf26f58463be33ed4868cd1902.zip
cpython-28a6001a021452bf26f58463be33ed4868cd1902.tar.gz
cpython-28a6001a021452bf26f58463be33ed4868cd1902.tar.bz2
Merged revisions 73913 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r73913 | r.david.murray | 2009-07-09 16:12:31 -0400 (Thu, 09 Jul 2009) | 18 lines 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). ........ ................
Diffstat (limited to 'Lib')
-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 8d1bb59..73ad95e 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -248,8 +248,8 @@ class PosixTester(unittest.TestCase):
_create_and_do_getcwd(dirname)
finally:
- support.rmtree(base_path)
os.chdir(curdir)
+ support.rmtree(base_path)
def test_main():