summaryrefslogtreecommitdiffstats
path: root/Lib/test/support
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-11-20 14:16:06 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-11-20 14:16:06 (GMT)
commit6770f8a4877eba56dd9978caf197795dbc3d3ffb (patch)
treef3dc4cf48d19a2e5d40a421e7c89fdb9c659b574 /Lib/test/support
parentf675a37ed3d033bd62af470540cfe50d9767a529 (diff)
downloadcpython-6770f8a4877eba56dd9978caf197795dbc3d3ffb.zip
cpython-6770f8a4877eba56dd9978caf197795dbc3d3ffb.tar.gz
cpython-6770f8a4877eba56dd9978caf197795dbc3d3ffb.tar.bz2
Issue #28666: Now test.support.rmtree is able to remove unwritable or
unreadable directories.
Diffstat (limited to 'Lib/test/support')
-rw-r--r--Lib/test/support/__init__.py32
1 files changed, 31 insertions, 1 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 09095db..1d65851 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -357,7 +357,37 @@ if sys.platform.startswith("win"):
else:
_unlink = os.unlink
_rmdir = os.rmdir
- _rmtree = shutil.rmtree
+
+ def _rmtree(path):
+ try:
+ shutil.rmtree(path)
+ return
+ except OSError:
+ pass
+
+ def force_run(path, func, *args):
+ try:
+ return func(*args)
+ except OSError as err:
+ if verbose >= 2:
+ print('%s: %s' % (err.__class__.__name__, err))
+ print('re-run %s%r' % (func.__name__, args))
+ os.chmod(path, stat.S_IRWXU)
+ return func(*args)
+ def _rmtree_inner(path):
+ for name in force_run(path, os.listdir, path):
+ fullname = os.path.join(path, name)
+ try:
+ mode = os.lstat(fullname).st_mode
+ except OSError:
+ mode = 0
+ if stat.S_ISDIR(mode):
+ _rmtree_inner(fullname)
+ force_run(path, os.rmdir, fullname)
+ else:
+ force_run(path, os.unlink, fullname)
+ _rmtree_inner(path)
+ os.rmdir(path)
def unlink(filename):
try: