]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Replace deprecated fail* methods with the equivalent assert* ones.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 5 Jun 2010 22:28:10 +0000 (22:28 +0000)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 5 Jun 2010 22:28:10 +0000 (22:28 +0000)
Lib/test/test_shutil.py

index 54e1c479482e5b1eaf9a649c0e3dc4b25a8d4ec6..d6839359bd712d0105223a632a682f8072368c78 100644 (file)
@@ -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():