Change in asterixdb[master]: Partial revert "[NO ISSUE][*DB][TEST] Minor test framework fixes"

[AsterixDB Code Review]

>From Michael Blow <mb...@apache.org>:

Michael Blow has uploaded this change for review. ( 
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20028 )


Change subject: Partial revert "[NO ISSUE][*DB][TEST] Minor test framework 
fixes"
......................................................................

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
---
M 
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
1 file changed, 13 insertions(+), 7 deletions(-)



  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/28/20028/1

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 8d943bf..890e188 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 @@
                     }
                 }
                 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) {

--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20028
To unsubscribe, or for help writing mail filters, visit 
https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I7513ed9fa302e1cea30660ebe6179792aac11619
Gerrit-Change-Number: 20028
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange