From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 2 Dec 2011 16:17:30 +0000 (+0200)
Subject: #8414: add more tests for "assert".  Initial patch by Gregory Nofi.
X-Git-Tag: v2.7.3rc1~270
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab731a3556af935304da10804e2b3c94274637c6;p=thirdparty%2FPython%2Fcpython.git

#8414: add more tests for "assert".  Initial patch by Gregory Nofi.
---

diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py
index 137ac233fcf4..86cc0843eef4 100644
--- a/Lib/test/test_grammar.py
+++ b/Lib/test/test_grammar.py
@@ -551,13 +551,35 @@ hello world
         assert 1, 1
         assert lambda x:x
         assert 1, lambda x:x+1
+
+        try:
+            assert True
+        except AssertionError as e:
+            self.fail("'assert True' should not have raised an AssertionError")
+
+        try:
+            assert True, 'this should always pass'
+        except AssertionError as e:
+            self.fail("'assert True, msg' should not have "
+                      "raised an AssertionError")
+
+    # these tests fail if python is run with -O, so check __debug__
+    @unittest.skipUnless(__debug__, "Won't work if __debug__ is False")
+    def testAssert2(self):
         try:
             assert 0, "msg"
         except AssertionError, e:
             self.assertEqual(e.args[0], "msg")
         else:
-            if __debug__:
-                self.fail("AssertionError not raised by assert 0")
+            self.fail("AssertionError not raised by assert 0")
+
+        try:
+            assert False
+        except AssertionError as e:
+            self.assertEqual(len(e.args), 0)
+        else:
+            self.fail("AssertionError not raised by 'assert False'")
+
 
     ### compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | funcdef | classdef
     # Tested below