[Python-checkins] r46871 - python/trunk/Lib/test/test_wsgiref.py
tim.peters
python-checkins at python.org
Sun Jun 11 22:53:00 CEST 2006
Author: tim.peters
Date: Sun Jun 11 22:52:59 2006
New Revision: 46871
Modified:
python/trunk/Lib/test/test_wsgiref.py
Log:
compare_generic_iter(): Fixed the failure of test_wsgiref's testFileWrapper
when running with -O.
test_simple_validation_error still fails under -O. That appears to be because
wsgiref's validate.py uses `assert` statements all over the place to check
arguments for sanity. That should all be changed (it's not a logical error
in the software if a user passes bogus arguments, so this isn't a reasonable
use for `assert` -- checking external preconditions should generally raise
ValueError or TypeError instead, as appropriate).
Modified: python/trunk/Lib/test/test_wsgiref.py
==============================================================================
--- python/trunk/Lib/test/test_wsgiref.py (original)
+++ python/trunk/Lib/test/test_wsgiref.py Sun Jun 11 22:52:59 2006
@@ -80,7 +80,7 @@
-def compare_generic_iter(make_it,match):
+def compare_generic_iter(test, make_it, match):
"""Utility to compare a generic 2.1/2.2+ iterator with an iterable
If running under Python 2.2+, this tests the iterator using iter()/next(),
@@ -90,7 +90,7 @@
it = make_it()
n = 0
for item in match:
- assert it[n]==item
+ test.assertEqual(it[n], item)
n+=1
try:
it[n]
@@ -106,15 +106,10 @@
else:
# Only test iter mode under 2.2+
it = make_it()
- assert iter(it) is it
+ test.assert_(iter(it) is it)
for item in match:
- assert it.next()==item
- try:
- it.next()
- except StopIteration:
- pass
- else:
- raise AssertionError("Too many items from .next()",it)
+ test.assertEqual(it.next(), item)
+ test.assertRaises(StopIteration, it.next)
@@ -208,7 +203,7 @@
def make_it(text=text,size=size):
return util.FileWrapper(StringIO(text),size)
- compare_generic_iter(make_it,match)
+ compare_generic_iter(self, make_it, match)
it = make_it()
self.failIf(it.filelike.closed)
@@ -440,7 +435,7 @@
h = BaseCGIHandler(None,None,None,{})
h.setup_environ()
for key in 'wsgi.url_scheme', 'wsgi.input', 'wsgi.errors':
- assert h.environ.has_key(key)
+ self.assert_(h.environ.has_key(key))
def testScheme(self):
h=TestHandler(HTTPS="on"); h.setup_environ()
More information about the Python-checkins
mailing list