You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by an...@apache.org on 2018/08/23 15:05:32 UTC
oozie git commit: OOZIE-3317 [build] Fix false positive precommit
reports (kmarton via andras.piros)
Repository: oozie
Updated Branches:
refs/heads/master c512332b0 -> 5989799d1
OOZIE-3317 [build] Fix false positive precommit reports (kmarton via andras.piros)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/5989799d
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/5989799d
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/5989799d
Branch: refs/heads/master
Commit: 5989799d15e99d887b7270a2e06535155d813f95
Parents: c512332
Author: Andras Piros <an...@cloudera.com>
Authored: Thu Aug 23 17:04:55 2018 +0200
Committer: Andras Piros <an...@cloudera.com>
Committed: Thu Aug 23 17:04:55 2018 +0200
----------------------------------------------------------------------
bin/test-patch-20-tests | 44 +++++++++++++++++++++++++-------------------
release-log.txt | 1 +
2 files changed, 26 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/5989799d/bin/test-patch-20-tests
----------------------------------------------------------------------
diff --git a/bin/test-patch-20-tests b/bin/test-patch-20-tests
index 65f9f4a..848b53d 100755
--- a/bin/test-patch-20-tests
+++ b/bin/test-patch-20-tests
@@ -154,27 +154,33 @@ generate_report() {
testsErrors=$(count_test_result_type errors)
hasFailures=$((testsFailed + testsErrors))
testsExitCode=$(cat "${TEMPDIR}/${TASKNAME}.exitCode")
+ errors=$(grep -c '\[ERROR\]' "${REPORTDIR}"/${TASKNAME}.out)
- if [[ ${hasFailures} != 0 ]] ; then
- echo "{color:red}-1 ${TASKNAME}{color}"
- echo ". Tests run: $testsRun"
- echo ". Tests failed: $testsFailed"
- echo ". Tests errors: $testsErrors"
- echo ""
- echo ". The patch failed the following testcases:"
- echo ""
- echo "${failedTests//#/. /}"
- echo ""
- echo ". Tests failing with errors:"
- echo "${testsWithError//#/. /}"
- echo ""
+ if [[ ${errors} -gt 0 && ${testsErrors} -eq 0 ]] ; then
+ echo "{color:red}-1 ${TASKNAME}{color}"
+ echo "There were errors during execution. Check console output for details."
else
- if [[ "${testsExitCode}" != "0" ]] ; then
- echo "{color:red}-1 ${TASKNAME}{color} - patch does not compile, cannot run testcases"
- else
- echo "{color:green}+1 ${TASKNAME}{color}"
- echo ". Tests run: $testsRun"
- fi
+ if [[ ${hasFailures} != 0 ]] ; then
+ echo "{color:red}-1 ${TASKNAME}{color}"
+ echo ". Tests run: $testsRun"
+ echo ". Tests failed: $testsFailed"
+ echo ". Tests errors: $testsErrors"
+ echo ""
+ echo ". The patch failed the following testcases:"
+ echo ""
+ echo "${failedTests//#/. /}"
+ echo ""
+ echo ". Tests failing with errors:"
+ echo "${testsWithError//#/. /}"
+ echo ""
+ else
+ if [[ "${testsExitCode}" != "0" ]] ; then
+ echo "{color:red}-1 ${TASKNAME}{color} - patch does not compile, cannot run testcases"
+ else
+ echo "{color:green}+1 ${TASKNAME}{color}"
+ echo ". Tests run: $testsRun"
+ fi
+ fi
fi
}
###############################################################################
http://git-wip-us.apache.org/repos/asf/oozie/blob/5989799d/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 70cbf47..97cff1a 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.1.0 release (trunk - unreleased)
+OOZIE-3317 [build] Fix false positive precommit reports (kmarton via andras.piros)
OOZIE-3264 Flaky test TestCoordMaterializeTransitionXCommand#testLastOnlyMaterialization (asalamon74 via andras.piros)
OOZIE-3331 [spark-action] Inconsistency while parsing quoted Spark options (asalamon74 via andras.piros)
OOZIE-3330 [spark-action] Remove double quotes inside plain option values (asalamon74 via andras.piros)