[Lldb-commits] [lldb] af7fc8c - [lldb] Remove unused and too strict error_msg parameter from expect_expr

[Raphael Isemann via lldb-commits]

Author: Raphael Isemann
Date: 2020-03-13T00:45:43+01:00
New Revision: af7fc8c1bbcb380610451be59c022595bd7ba4bd

URL: https://github.com/llvm/llvm-project/commit/af7fc8c1bbcb380610451be59c022595bd7ba4bd
DIFF: https://github.com/llvm/llvm-project/commit/af7fc8c1bbcb380610451be59c022595bd7ba4bd.diff

LOG: [lldb] Remove unused and too strict error_msg parameter from expect_expr

Directly matching the error message is nearly never useful. We can re-add
error-checking once we have a plan to properly implement this.

Added: 
    

Modified: 
    lldb/packages/Python/lldbsuite/test/lldbtest.py

Removed: 
    


################################################################################
diff  --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index cd48747c3557..f8f916036f9a 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -2396,7 +2396,6 @@ def expect_expr(
             result_summary=None,
             result_value=None,
             result_type=None,
-            error_msg=None,
             ):
         """
         Evaluates the given expression and verifies the result.
@@ -2404,7 +2403,6 @@ def expect_expr(
         :param result_summary: The summary that the expression should have. None if the summary should not be checked.
         :param result_value: The value that the expression should have. None if the value should not be checked.
         :param result_type: The type that the expression result should have. None if the type should not be checked.
-        :param error_msg: The error message the expression should return. None if the error output should not be checked.
         """
         self.assertTrue(expr.strip() == expr, "Expression contains trailing/leading whitespace: '" + expr + "'")
 
@@ -2420,11 +2418,6 @@ def expect_expr(
 
         eval_result = frame.EvaluateExpression(expr, options)
 
-        if error_msg:
-            self.assertFalse(eval_result.IsValid(), "Unexpected success with result: '" + str(eval_result) + "'")
-            self.assertEqual(error_msg, eval_result.GetError().GetCString())
-            return
-
         if not eval_result.GetError().Success():
             self.assertTrue(eval_result.GetError().Success(),
                 "Unexpected failure with msg: " + eval_result.GetError().GetCString())