>From Michael Blow <[email protected]>: Michael Blow has submitted this change. ( 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 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20028 Reviewed-by: Michael Blow <[email protected]> Tested-by: Michael Blow <[email protected]> --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java 1 file changed, 16 insertions(+), 7 deletions(-) Approvals: Michael Blow: Looks good to me, approved; Verified 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: 2 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-CC: Anon. E. Moose #1000171 Gerrit-CC: Jenkins <[email protected]> Gerrit-MessageType: merged
