Merged revisions 73715 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

........
  r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line

  convert old fail* assertions to assert*
........
This commit is contained in:
Georg Brandl 2009-08-13 08:51:18 +00:00
parent ef82be368a
commit ab91fdef1f
274 changed files with 4538 additions and 4538 deletions

View file

@ -58,7 +58,7 @@ class OSSAudioDevTests(unittest.TestCase):
dsp.fileno()
# Make sure the read-only attributes work.
self.failIf(dsp.closed)
self.assertFalse(dsp.closed)
self.assertEqual(dsp.name, "/dev/dsp")
self.assertEqual(dsp.mode, "w", "bad dsp.mode: %r" % dsp.mode)
@ -84,7 +84,7 @@ class OSSAudioDevTests(unittest.TestCase):
elapsed_time = t2 - t1
percent_diff = (abs(elapsed_time - expected_time) / expected_time) * 100
self.failUnless(percent_diff <= 10.0,
self.assertTrue(percent_diff <= 10.0,
"elapsed time (%s) > 10%% off of expected time (%s)" %
(elapsed_time, expected_time))
@ -133,7 +133,7 @@ class OSSAudioDevTests(unittest.TestCase):
]:
(fmt, channels, rate) = config
result = dsp.setparameters(fmt, channels, rate, False)
self.failIfEqual(result, config,
self.assertNotEqual(result, config,
"unexpectedly got requested configuration")
try:
@ -157,7 +157,7 @@ class OSSAudioDevTests(unittest.TestCase):
#self.set_bad_parameters(dsp)
finally:
dsp.close()
self.failUnless(dsp.closed)
self.assertTrue(dsp.closed)
def test_main():