summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2012-11-10 23:12:55 (GMT)
committerGregory P. Smith <greg@krypto.org>2012-11-10 23:12:55 (GMT)
commit6d9388faab63343db47e59eb28c926bc3cbe75d1 (patch)
tree787fcd3838d18135e1d33c9c07c07f3411a62842
parent6e467049c68632dd58502a42b367100e99edb66b (diff)
downloadcpython-6d9388faab63343db47e59eb28c926bc3cbe75d1.zip
cpython-6d9388faab63343db47e59eb28c926bc3cbe75d1.tar.gz
cpython-6d9388faab63343db47e59eb28c926bc3cbe75d1.tar.bz2
Fix test_urllib broken by my previous commits. The assumptions it was
testing were added as part of the issue10050 change that caused the wrong behavior in the first place. now all test cases agree on the behavior.
-rw-r--r--Lib/test/test_urllib.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 623eb5e..52e7749 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -455,8 +455,8 @@ class urlretrieve_FileTests(unittest.TestCase):
urllib.request.urlretrieve(self.constructLocalFileUrl(srcFileName),
support.TESTFN, hooktester)
self.assertEqual(len(report), 2)
- self.assertEqual(report[0][1], 0)
- self.assertEqual(report[1][1], 5)
+ self.assertEqual(report[0][2], 5)
+ self.assertEqual(report[1][2], 5)
def test_reporthook_8193_bytes(self):
# Test on 8193 byte file. Should call reporthook only 3 times (once
@@ -469,9 +469,10 @@ class urlretrieve_FileTests(unittest.TestCase):
urllib.request.urlretrieve(self.constructLocalFileUrl(srcFileName),
support.TESTFN, hooktester)
self.assertEqual(len(report), 3)
- self.assertEqual(report[0][1], 0)
+ self.assertEqual(report[0][2], 8193)
+ self.assertEqual(report[0][1], 8192)
self.assertEqual(report[1][1], 8192)
- self.assertEqual(report[2][1], 1)
+ self.assertEqual(report[2][1], 8192)
class urlretrieve_HttpTests(unittest.TestCase, FakeHTTPMixin):