修复当assert_函数带有参数指定时rewrite报错问题

testbase/assertion.py

@@ -231,8 +231,15 @@ def rewrite_assert_(self, elem):
 
         # Rewrite assert into a bunch of statements.
         if isinstance(elem, ast.Expr):
-            top_condition, explanation = self.visit(elem.value.args[1])
-            msg_arg = elem.value.args[0]
+            if len(elem.value.args) < 2 and getattr(elem.value, "keywords", None):
+                for keyword in elem.value.keywords:
+                    if keyword.arg == "message":
+                        msg_arg = keyword.value
+                    elif keyword.arg == "value":
+                        top_condition, explanation = self.visit(keyword.value)
+            else:
+                top_condition, explanation = self.visit(elem.value.args[1])
+                msg_arg = elem.value.args[0]
             caller_id = "self"
         elif isinstance(elem, ast.Call):
             top_condition, explanation = self.visit(elem.args[1])

tests/test_testbase/test_assert.py

@@ -57,6 +57,16 @@ def assert_foo_bar_with_for(self):
         for _ in range(2):
             self.assert_("assert", self.foo(self.bar(1)) in [2, 4])
 
+    def assert_foo_bar_with_while(self):
+        i = 1
+        while i < 3:
+            self.assert_("assert", self.foo(self.bar(1)) in [2, 4])
+
+    def assert_foo_bar_with_dict(self):
+        i = 1
+        if i == 1:
+            self.assert_(message="assert", value=self.foo(self.bar(1)) in [2, 4])
+
 
 class AssertionInnerInvokeForTest(AssertionFailureTest):
     """xxxx"""