(asterixdb) branch master updated: Partial revert "[NO ISSUE][*DB][TEST] Minor test framework fixes"

[mblow]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 84ae52b381 Partial revert "[NO ISSUE][*DB][TEST] Minor test framework 
fixes"
84ae52b381 is described below

commit 84ae52b3818cd83978d8781d24b39bc34d030ba5
Author: Michael Blow <michael.b...@couchbase.com>
AuthorDate: Mon Jul 7 01:13:26 2025 -0400

    Partial revert "[NO ISSUE][*DB][TEST] Minor test framework fixes"
    
    This partially reverts commit 18de93a48b915b775b803fea03bbdef2d742dbc5,
    as it's causing failure in cancellation test
    
    Change-Id: I7513ed9fa302e1cea30660ebe6179792aac11619
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20028
    Reviewed-by: Michael Blow <mb...@apache.org>
    Tested-by: Michael Blow <mb...@apache.org>
---
 .../test/java/org/apache/asterix/test/common/TestExecutor.java    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
index 8d943bf58a..890e1882f6 100644
--- 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
+++ 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
@@ -2258,18 +2258,12 @@ public class TestExecutor {
                     }
                 }
                 if (numOfFiles == testFileCtxs.size()) {
-                    int numExpectedErrors = cUnit.getExpectedError().size();
-                    if (testCaseCtx.numOfErrors < numExpectedErrors) {
+                    if (testCaseCtx.numOfErrors < 
cUnit.getExpectedError().size()) {
                         LOGGER.error("Test {} failed to raise (an) expected 
exception(s)", cUnit.getName());
                         throw new Exception(
                                 "Test \"" + cUnit.getName() + "\" FAILED; 
expected exception was not thrown...");
                     }
                     ensureWarnings(testCaseCtx.expectedWarnings, cUnit);
-                    if (testCaseCtx.numOfErrors > numExpectedErrors) {
-                        LOGGER.error("Test {} raised more exceptions than 
expected", cUnit.getName());
-                        throw new Exception(
-                                "Test \"" + cUnit.getName() + "\" FAILED; too 
many exceptions were thrown...");
-                    }
                     LOGGER.info(
                             "[TEST]: " + 
testCaseCtx.getTestCase().getFilePath() + "/" + cUnit.getName() + " PASSED ");
                     if (passedGroup != null) {