This is an automated email from the ASF dual-hosted git repository.

michaelsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit 0a45cb5ae6d1345a7d531c22d174c99ea7cedea0
Author: jasonmfehr <[email protected]>
AuthorDate: Thu Aug 15 14:04:44 2024 -0700

    IMPALA-13298: Correct test_miss_complete_cb Assertion
    
    Commit ad868b9 modified the RPC error messages to include the
    query id. Part of this change was to remove the string
    "Query aborted" from the test's beeswax client when it raises an
    error.
    
    The TestRPCTimeout.test_miss_complete_cb was missed and was still
    asserting on the string "Query aborted". This patch fixes that test
    to use the new error_msg_expected() function.
    
    Testing was accomplished by running the
    TestRPCTimeout.test_miss_complete_cb test locally.
    
    Change-Id: Ifb2fa3864b52b0927c6488b22135913b90bce3bd
    Reviewed-on: http://gerrit.cloudera.org:8080/21678
    Reviewed-by: Riza Suminto <[email protected]>
    Reviewed-by: Xuebin Su <[email protected]>
    Reviewed-by: Michael Smith <[email protected]>
    Tested-by: Michael Smith <[email protected]>
---
 tests/custom_cluster/test_rpc_timeout.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/custom_cluster/test_rpc_timeout.py 
b/tests/custom_cluster/test_rpc_timeout.py
index 375a4b9c4..811bb99a9 100644
--- a/tests/custom_cluster/test_rpc_timeout.py
+++ b/tests/custom_cluster/test_rpc_timeout.py
@@ -22,6 +22,7 @@ from tests.beeswax.impala_beeswax import 
ImpalaBeeswaxException
 from tests.common.custom_cluster_test_suite import CustomClusterTestSuite
 from tests.common.impala_cluster import ImpalaCluster
 from tests.common.skip import SkipIfBuildType, SkipIfFS
+from tests.common.test_result_verifier import error_msg_expected
 from tests.verifiers.metric_verifier import MetricVerifier
 
 # The BE krpc port of the impalad to simulate rpc errors in tests.
@@ -228,7 +229,8 @@ class TestRPCTimeout(CustomClusterTestSuite):
     debug_action = 'IMPALA_MISS_EXEC_COMPLETE_CB:[email protected]'
     ex = self.execute_query_expect_failure(self.client, query,
         query_options={'retry_failed_queries': 'false', 'debug_action': 
debug_action})
-    assert "Query aborted" in str(ex)
+    assert error_msg_expected(str(ex), "Remote error: Runtime error: Debug 
Action: "
+        "IMPALA_SERVICE_POOL:FAIL")
 
 class TestCatalogRPCTimeout(CustomClusterTestSuite):
   """"Tests RPC timeout and retry handling for catalogd operations."""

Reply via email to