[Python-checkins] cpython (2.7): Try to fix test.test_support.rmtree() on Windows for fixing issue28847 tests.

serhiy.storchaka python-checkins at python.org
Sat Dec 3 00:58:15 EST 2016


https://hg.python.org/cpython/rev/cb4a892e9b66
changeset:   105424:cb4a892e9b66
branch:      2.7
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sat Dec 03 07:57:54 2016 +0200
summary:
  Try to fix test.test_support.rmtree() on Windows for fixing issue28847 tests.

files:
  Lib/test/test_support.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -239,9 +239,9 @@
                 fullname = os.path.join(path, name)
                 if os.path.isdir(fullname):
                     _waitfor(_rmtree_inner, fullname, waitall=True)
-                    _force_run(path, os.rmdir, fullname)
+                    _force_run(fullname, os.rmdir, fullname)
                 else:
-                    _force_run(path, os.unlink, fullname)
+                    _force_run(fullname, os.unlink, fullname)
         _waitfor(_rmtree_inner, path, waitall=True)
         _waitfor(lambda p: _force_run(p, os.rmdir, p), path)
 else:

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list