Changeset 391 for python/trunk/Lib/test/test_augassign.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_augassign.py (modified) (11 diffs)

python/trunk/Lib/test/test_augassign.py

@@ -1 +1 @@
 # Augmented assignment test.
 
-from test.test_support import run_unittest
+from test.test_support import run_unittest, check_py3k_warnings
 import unittest
 
@@ -20 +20 @@
         if 1/2 == 0:
             # classic division
-            self.assertEquals(x, 3)
+            self.assertEqual(x, 3)
         else:
             # new-style division (with -Qnew)
-            self.assertEquals(x, 3.0)
+            self.assertEqual(x, 3.0)
+
+    def test_with_unpacking(self):
+        self.assertRaises(SyntaxError, compile, "x, b += 3", "<test>", "exec")
 
     def testInList(self):
@@ -38 +41 @@
         x[0] /= 2
         if 1/2 == 0:
-            self.assertEquals(x[0], 3)
+            self.assertEqual(x[0], 3)
         else:
-            self.assertEquals(x[0], 3.0)
+            self.assertEqual(x[0], 3.0)
 
     def testInDict(self):
@@ -55 +58 @@
         x[0] /= 2
         if 1/2 == 0:
-            self.assertEquals(x[0], 3)
+            self.assertEqual(x[0], 3)
         else:
-            self.assertEquals(x[0], 3.0)
+            self.assertEqual(x[0], 3.0)
 
     def testSequences(self):
@@ -64 +67 @@
         x *= 2
 
-        self.assertEquals(x, [1, 2, 3, 4, 1, 2, 3, 4])
+        self.assertEqual(x, [1, 2, 3, 4, 1, 2, 3, 4])
 
         x = [1, 2, 3]
@@ -71 +74 @@
         y[1:2] += [1]
 
-        self.assertEquals(x, [1, 2, 1, 2, 3])
-        self.assert_(x is y)
+        self.assertEqual(x, [1, 2, 1, 2, 3])
+        self.assertTrue(x is y)
 
     def testCustomMethods1(self):
@@ -97 +100 @@
         x += 10
 
-        self.assert_(isinstance(x, aug_test))
-        self.assert_(y is not x)
-        self.assertEquals(x.val, 11)
+        self.assertIsInstance(x, aug_test)
+        self.assertTrue(y is not x)
+        self.assertEqual(x.val, 11)
 
         x = aug_test2(2)
@@ -105 +108 @@
         x += 10
 
-        self.assert_(y is x)
-        self.assertEquals(x.val, 12)
+        self.assertTrue(y is x)
+        self.assertEqual(x.val, 12)
 
         x = aug_test3(3)
@@ -112 +115 @@
         x += 10
 
-        self.assert_(isinstance(x, aug_test3))
-        self.assert_(y is not x)
-        self.assertEquals(x.val, 13)
+        self.assertIsInstance(x, aug_test3)
+        self.assertTrue(y is not x)
+        self.assertEqual(x.val, 13)
 
 
@@ -282 +285 @@
         x <<= 1
 
-        test_self.assertEquals(output, '''\
+        test_self.assertEqual(output, '''\
 __add__ called
 __radd__ called
@@ -322 +325 @@
 
 def test_main():
-    run_unittest(AugAssignTest)
+    with check_py3k_warnings(("classic int division", DeprecationWarning)):
+        run_unittest(AugAssignTest)
 
 if __name__ == '__main__':