Patch #1695862: remove old test directory that causes test_urllib failures
on Windows buildbots. The change is a one time fix and will be removed
after a successful buildbot run.
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 4851742..02f89c3 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -547,6 +547,20 @@
def test_main():
+ # cleanup old test dir on Windows buildbots
+ old_test_path = test_support.TESTFN + ".2"
+ if os.path.isdir(old_test_path):
+ for root, dirs, files in os.walk(old_test_path, topdown=False):
+ for name in files:
+ os.remove(os.path.join(root, name))
+ for name in dirs:
+ dirname = os.path.join(root, name)
+ if not os.path.islink(dirname):
+ os.rmdir(dirname)
+ else:
+ os.remove(dirname)
+ os.rmdir(old_test_path)
+
test_support.run_unittest(
urlopen_FileTests,
urlopen_HttpTests,