[Python-checkins] cpython: Proper cleanup in test_shutil, even in case of error.
antoine.pitrou
python-checkins at python.org
Sat Jun 23 21:31:47 CEST 2012
http://hg.python.org/cpython/rev/58c0f261a3b7
changeset: 77644:58c0f261a3b7
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sat Jun 23 21:28:15 2012 +0200
summary:
Proper cleanup in test_shutil, even in case of error.
files:
Lib/test/test_shutil.py | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -120,6 +120,8 @@
def test_on_error(self):
self.errorState = 0
os.mkdir(TESTFN)
+ self.addCleanup(shutil.rmtree, TESTFN)
+
self.child_file_path = os.path.join(TESTFN, 'a')
self.child_dir_path = os.path.join(TESTFN, 'b')
support.create_empty_file(self.child_file_path)
@@ -133,20 +135,16 @@
os.chmod(self.child_dir_path, new_mode)
os.chmod(TESTFN, new_mode)
+ self.addCleanup(os.chmod, TESTFN, old_dir_mode)
+ self.addCleanup(os.chmod, self.child_file_path, old_child_file_mode)
+ self.addCleanup(os.chmod, self.child_dir_path, old_child_dir_mode)
+
shutil.rmtree(TESTFN, onerror=self.check_args_to_onerror)
# Test whether onerror has actually been called.
self.assertEqual(self.errorState, 3,
"Expected call to onerror function did not "
"happen.")
- # Make writable again.
- os.chmod(TESTFN, old_dir_mode)
- os.chmod(self.child_file_path, old_child_file_mode)
- os.chmod(self.child_dir_path, old_child_dir_mode)
-
- # Clean up.
- shutil.rmtree(TESTFN)
-
def check_args_to_onerror(self, func, arg, exc):
# test_rmtree_errors deliberately runs rmtree
# on a directory that is chmod 500, which will fail.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list