convert usage of fail* to assert*
diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py
index b6d994b..db82139 100755
--- a/Lib/test/test_wsgiref.py
+++ b/Lib/test/test_wsgiref.py
@@ -149,7 +149,7 @@
start_response("200 OK", ('Content-Type','text/plain'))
return ["Hello, world!"]
out, err = run_amock(validator(bad_app))
- self.failUnless(out.endswith(
+ self.assertTrue(out.endswith(
"A server error occurred. Please contact the administrator."
))
self.assertEqual(
@@ -178,14 +178,14 @@
env = {}
util.setup_testing_defaults(env)
if isinstance(value,StringIO):
- self.failUnless(isinstance(env[key],StringIO))
+ self.assertTrue(isinstance(env[key],StringIO))
else:
self.assertEqual(env[key],value)
# Check existing value
env = {key:alt}
util.setup_testing_defaults(env)
- self.failUnless(env[key] is alt)
+ self.assertTrue(env[key] is alt)
def checkCrossDefault(self,key,value,**kw):
util.setup_testing_defaults(kw)
@@ -212,15 +212,15 @@
compare_generic_iter(make_it,match)
it = make_it()
- self.failIf(it.filelike.closed)
+ self.assertFalse(it.filelike.closed)
for item in it:
pass
- self.failIf(it.filelike.closed)
+ self.assertFalse(it.filelike.closed)
it.close()
- self.failUnless(it.filelike.closed)
+ self.assertTrue(it.filelike.closed)
def testSimpleShifts(self):
@@ -318,14 +318,14 @@
"TE Trailers Transfer-Encoding Upgrade"
).split():
for alt in hop, hop.title(), hop.upper(), hop.lower():
- self.failUnless(util.is_hop_by_hop(alt))
+ self.assertTrue(util.is_hop_by_hop(alt))
# Not comprehensive, just a few random header names
for hop in (
"Accept Cache-Control Date Pragma Trailer Via Warning"
).split():
for alt in hop, hop.title(), hop.upper(), hop.lower():
- self.failIf(util.is_hop_by_hop(alt))
+ self.assertFalse(util.is_hop_by_hop(alt))
class HeaderTests(TestCase):
@@ -336,17 +336,17 @@
self.assertEqual(Headers(test[:]).keys(), ['x'])
self.assertEqual(Headers(test[:]).values(), ['y'])
self.assertEqual(Headers(test[:]).items(), test)
- self.failIf(Headers(test).items() is test) # must be copy!
+ self.assertFalse(Headers(test).items() is test) # must be copy!
h=Headers([])
del h['foo'] # should not raise an error
h['Foo'] = 'bar'
for m in h.has_key, h.__contains__, h.get, h.get_all, h.__getitem__:
- self.failUnless(m('foo'))
- self.failUnless(m('Foo'))
- self.failUnless(m('FOO'))
- self.failIf(m('bar'))
+ self.assertTrue(m('foo'))
+ self.assertTrue(m('Foo'))
+ self.assertTrue(m('FOO'))
+ self.assertFalse(m('bar'))
self.assertEqual(h['foo'],'bar')
h['foo'] = 'baz'
@@ -428,7 +428,7 @@
if not empty.has_key(k):
self.assertEqual(env[k],v)
for k,v in empty.items():
- self.failUnless(env.has_key(k))
+ self.assertTrue(env.has_key(k))
def testEnviron(self):
h = TestHandler(X="Y")
@@ -441,7 +441,7 @@
h = BaseCGIHandler(None,None,None,{})
h.setup_environ()
for key in 'wsgi.url_scheme', 'wsgi.input', 'wsgi.errors':
- self.assert_(h.environ.has_key(key))
+ self.assertTrue(h.environ.has_key(key))
def testScheme(self):
h=TestHandler(HTTPS="on"); h.setup_environ()
@@ -516,7 +516,7 @@
"Content-Length: %d\r\n"
"\r\n%s" % (h.error_status,len(h.error_body),h.error_body))
- self.failUnless(h.stderr.getvalue().find("AssertionError")<>-1)
+ self.assertTrue(h.stderr.getvalue().find("AssertionError")<>-1)
def testErrorAfterOutput(self):
MSG = "Some output has been sent"
@@ -529,7 +529,7 @@
self.assertEqual(h.stdout.getvalue(),
"Status: 200 OK\r\n"
"\r\n"+MSG)
- self.failUnless(h.stderr.getvalue().find("AssertionError")<>-1)
+ self.assertTrue(h.stderr.getvalue().find("AssertionError")<>-1)
def testHeaderFormats(self):
@@ -568,7 +568,7 @@
if proto=="HTTP/0.9":
self.assertEqual(h.stdout.getvalue(),"")
else:
- self.failUnless(
+ self.assertTrue(
re.match(stdpat%(version,sw), h.stdout.getvalue()),
(stdpat%(version,sw), h.stdout.getvalue())
)