Changeset 391 for python/trunk/Lib/test/test_coercion.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_coercion.py (modified) (7 diffs)

python/trunk/Lib/test/test_coercion.py

@@ -1 +1 @@
 import copy
-import warnings
 import unittest
-from test.test_support import run_unittest, TestFailed
+from test.test_support import run_unittest, TestFailed, check_warnings
+
 
 # Fake a number that implements numeric methods through __coerce__
@@ -224 +224 @@
 
 
-
-process_infix_results()
-# now infix_results has two lists of results for every pairing.
+with check_warnings(("classic (int|long) division", DeprecationWarning),
+                    quiet=True):
+    process_infix_results()
+    # now infix_results has two lists of results for every pairing.
 
 prefix_binops = [ 'divmod' ]
@@ -266 +267 @@
                                           'a %s b' % op, {'a': a, 'b': b})
                     else:
-                        self.assertEquals(format_result(res),
-                                          format_result(eval('a %s b' % op)),
-                                          '%s %s %s == %s failed' % (a, op, b, res))
+                        self.assertEqual(format_result(res),
+                                         format_result(eval('a %s b' % op)),
+                                         '%s %s %s == %s failed' % (a, op, b, res))
                     try:
                         z = copy.copy(a)
@@ -282 +283 @@
                     else:
                         exec('z %s= b' % op)
-                        self.assertEquals(ires, z)
+                        self.assertEqual(ires, z)
 
     def test_prefix_binops(self):
@@ -293 +294 @@
                                           '%s(a, b)' % op, {'a': a, 'b': b})
                     else:
-                        self.assertEquals(format_result(res),
-                                          format_result(eval('%s(a, b)' % op)),
-                                          '%s(%s, %s) == %s failed' % (op, a, b, res))
+                        self.assertEqual(format_result(res),
+                                         format_result(eval('%s(a, b)' % op)),
+                                         '%s(%s, %s) == %s failed' % (op, a, b, res))
 
     def test_cmptypes(self):
@@ -303 +304 @@
         evil_coercer = CoerceTo(42)
         # Make sure these don't crash any more
-        self.assertNotEquals(cmp(u'fish', evil_coercer), 0)
-        self.assertNotEquals(cmp(slice(1), evil_coercer), 0)
+        self.assertNotEqual(cmp(u'fish', evil_coercer), 0)
+        self.assertNotEqual(cmp(slice(1), evil_coercer), 0)
         # ...but that this still works
         class WackyComparer(object):
             def __cmp__(slf, other):
-                self.assert_(other == 42, 'expected evil_coercer, got %r' % other)
+                self.assertTrue(other == 42, 'expected evil_coercer, got %r' % other)
                 return 0
             __hash__ = None # Invalid cmp makes this unhashable
-        self.assertEquals(cmp(WackyComparer(), evil_coercer), 0)
+        self.assertEqual(cmp(WackyComparer(), evil_coercer), 0)
         # ...and classic classes too, since that code path is a little different
         class ClassicWackyComparer:
             def __cmp__(slf, other):
-                self.assert_(other == 42, 'expected evil_coercer, got %r' % other)
+                self.assertTrue(other == 42, 'expected evil_coercer, got %r' % other)
                 return 0
-        self.assertEquals(cmp(ClassicWackyComparer(), evil_coercer), 0)
+        self.assertEqual(cmp(ClassicWackyComparer(), evil_coercer), 0)
 
     def test_infinite_rec_classic_classes(self):
@@ -338 +339 @@
 
 def test_main():
-    warnings.filterwarnings("ignore",
-                            r'complex divmod\(\), // and % are deprecated',
-                            DeprecationWarning,
-                            r'test.test_coercion$')
-    run_unittest(CoercionTest)
+    with check_warnings(("complex divmod.., // and % are deprecated",
+                         DeprecationWarning),
+                        ("classic (int|long) division", DeprecationWarning),
+                        quiet=True):
+        run_unittest(CoercionTest)
 
 if __name__ == "__main__":