[Opendnssec-commits] jerry r6925 - in home/jerry/OpenDNSSEC-trunk-testing-junit: . test-cases.d/10-ksmutil-update

commits at svn.opendnssec.org commits at svn.opendnssec.org
Wed Jan 2 11:42:44 CET 2013


Author: jerry
Date: Wed Jan  2 11:42:44 2013
New Revision: 6925
URL: http://fisheye.opendnssec.org/changelog/opendnssec?cs=6925

Log:
OPENDNSSEC-357: Put script output as system error on failure since Jenkins seems to truncate system out, testing it by failing a test with long output.

Modified:
   home/jerry/OpenDNSSEC-trunk-testing-junit/lib.sh
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-ksmutil-update/test.sh

Modified: home/jerry/OpenDNSSEC-trunk-testing-junit/lib.sh
==============================================================================
--- home/jerry/OpenDNSSEC-trunk-testing-junit/lib.sh	Wed Jan  2 11:13:47 2013	(r6924)
+++ home/jerry/OpenDNSSEC-trunk-testing-junit/lib.sh	Wed Jan  2 11:42:44 2013	(r6925)
@@ -1576,9 +1576,9 @@
             echo '<testcase name="'"$test_name"'" classname="'"$test_classname"'" time="'"$test_time"'">' >> "$junit_test"
             echo '<failure message="Failed">Test failed, exit code '"$test_status"'</failure>' >> "$junit_test"
             echo '</testcase>' >> "$junit_test"
-            echo '<system-out>' >> "$junit_test"
+            echo '<system-err>' >> "$junit_test"
             cat "_test.$BUILD_TAG" | sed 's%&%\&%g' | sed 's%<%\<%g' | sed 's%>%\>%g' >> "$junit_test" 2>/dev/null
-            echo '</system-out>' >> "$junit_test"
+            echo '</system-err>' >> "$junit_test"
             echo '</testsuite>' >> "$junit_test"
 		fi
 		rm -f "_test.$BUILD_TAG"

Modified: home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-ksmutil-update/test.sh
==============================================================================
--- home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-ksmutil-update/test.sh	Wed Jan  2 11:13:47 2013	(r6924)
+++ home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-ksmutil-update/test.sh	Wed Jan  2 11:42:44 2013	(r6925)
@@ -65,7 +65,7 @@
 
 log_this_timeout ods-control-enforcer-stop 60 ods-control enforcer stop &&
 syslog_waitfor 60 'ods-enforcerd: .*all done' &&
-return 0
+return 1
 
 ods_kill
 return 1



More information about the Opendnssec-commits mailing list