diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-06-05 22:28:10 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-06-05 22:28:10 (GMT) |
| commit | 62c3c794264ee30dfb49cd292cd2e21869b68452 (patch) | |
| tree | 99aaced577b037ac910496a1f5051625c446ca5f | |
| parent | 8dde20168aff434a662e0ee1af5d0c63a6f5c05b (diff) | |
| download | cpython-62c3c794264ee30dfb49cd292cd2e21869b68452.zip cpython-62c3c794264ee30dfb49cd292cd2e21869b68452.tar.gz cpython-62c3c794264ee30dfb49cd292cd2e21869b68452.tar.bz2 | |
Replace deprecated fail* methods with the equivalent assert* ones.
| -rw-r--r-- | Lib/test/test_shutil.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index 54e1c47..d683935 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -751,8 +751,8 @@ class TestCopyFile(unittest.TestCase): self._set_shutil_open(_open) shutil.copyfile('srcfile', 'destfile') - self.failUnless(srcfile._entered) - self.failUnless(srcfile._exited_with[0] is IOError) + self.assertTrue(srcfile._entered) + self.assertTrue(srcfile._exited_with[0] is IOError) self.assertEqual(srcfile._exited_with[1].args, ('Cannot open "destfile"',)) @@ -771,10 +771,10 @@ class TestCopyFile(unittest.TestCase): self._set_shutil_open(_open) shutil.copyfile('srcfile', 'destfile') - self.failUnless(srcfile._entered) - self.failUnless(destfile._entered) - self.failUnless(destfile._raised) - self.failUnless(srcfile._exited_with[0] is IOError) + self.assertTrue(srcfile._entered) + self.assertTrue(destfile._entered) + self.assertTrue(destfile._raised) + self.assertTrue(srcfile._exited_with[0] is IOError) self.assertEqual(srcfile._exited_with[1].args, ('Cannot close',)) @@ -794,11 +794,11 @@ class TestCopyFile(unittest.TestCase): self.assertRaises(IOError, shutil.copyfile, 'srcfile', 'destfile') - self.failUnless(srcfile._entered) - self.failUnless(destfile._entered) - self.failIf(destfile._raised) - self.failUnless(srcfile._exited_with[0] is None) - self.failUnless(srcfile._raised) + self.assertTrue(srcfile._entered) + self.assertTrue(destfile._entered) + self.assertFalse(destfile._raised) + self.assertTrue(srcfile._exited_with[0] is None) + self.assertTrue(srcfile._raised) def test_main(): |