summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorŽiga Seilnacht <ziga.seilnacht@gmail.com>2007-04-12 08:46:51 (GMT)
committerŽiga Seilnacht <ziga.seilnacht@gmail.com>2007-04-12 08:46:51 (GMT)
commit9aba6d6905bcf3f3009f71cfa70525eb8b0ad3dc (patch)
tree0a3a57984d067796a2d4f559c3082ded2f4627b0 /Lib
parente2d827d7ef6cae4932c85e1a00b81ed249fbddeb (diff)
downloadcpython-9aba6d6905bcf3f3009f71cfa70525eb8b0ad3dc.zip
cpython-9aba6d6905bcf3f3009f71cfa70525eb8b0ad3dc.tar.gz
cpython-9aba6d6905bcf3f3009f71cfa70525eb8b0ad3dc.tar.bz2
Patch #1695862: remove the cleanup code, now that Windows buildbots are green
again.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_urllib.py17
1 files changed, 0 insertions, 17 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 02f89c3..294ed5e 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -27,7 +27,6 @@ class urlopen_FileTests(unittest.TestCase):
def setUp(self):
"""Setup of a temp file to use for testing"""
self.text = "test_urllib: %s\n" % self.__class__.__name__
- test_support.unlink(test_support.TESTFN)
FILE = file(test_support.TESTFN, 'wb')
try:
FILE.write(self.text)
@@ -196,7 +195,6 @@ class urlretrieve_FileTests(unittest.TestCase):
def test_copy(self):
# Test that setting the filename argument works.
second_temp = "%s.2" % test_support.TESTFN
- test_support.unlink(second_temp)
self.registerFileForCleanUp(second_temp)
result = urllib.urlretrieve(self.constructLocalFileUrl(
test_support.TESTFN), second_temp)
@@ -221,7 +219,6 @@ class urlretrieve_FileTests(unittest.TestCase):
self.assertEqual(count, count_holder[0])
count_holder[0] = count_holder[0] + 1
second_temp = "%s.2" % test_support.TESTFN
- test_support.unlink(second_temp)
self.registerFileForCleanUp(second_temp)
urllib.urlretrieve(self.constructLocalFileUrl(test_support.TESTFN),
second_temp, hooktester)
@@ -547,20 +544,6 @@ class Pathname_Tests(unittest.TestCase):
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,