[Opendnssec-commits] jerry r6963 - in home/jerry/OpenDNSSEC-trunk-testing-junit: . test-cases.d/00-start-and-stop test-cases.d/10-010-odscc10t10 test-cases.d/10-020-odscc10t20 test-cases.d/10-030-odscc10t30 test-cases.d/10-040-odscc10t40 test-cases.d/10-050-odscc10t50 test-cases.d/10-060-odscc10t60 test-cases.d/10-070-odscc10t70 test-cases.d/10-080-odscc10t80 test-cases.d/10-090-odscc10t90 test-cases.d/10-100-odscc10t100 test-cases.d/10-110-odscc10t110 test-cases.d/10-120-odscc10t120 test-cases.d/10-130-odscc10t130 test-cases.d/10-150-odscc10t150 test-cases.d/10-160-odscc10t160 test-cases.d/10-add-delete-zone test-cases.d/10-dual-policy-check-signconf test-cases.d/10-kaspcheck test-cases.d/10-ksmutil-update test-cases.d/10-multi-threaded-enforcer test-cases.d/10-pin-daemon test-cases.d/10-validate-test-zones test-cases.d/14-dns-input-adapter test-cases.d/14-dns-ixfr-notimpl test-cases.d/14-dns-output-adapter test-cases.d/14-dns-output-notify test-cases.d/14-dns-refresh test-cases.d/14-dns-retry- expire test-cases.d/20-010-odscc20t10 test-cases.d/20-020-odscc20t20 test-cases.d/20-030-odscc20t30 test-cases.d/20-040-odscc20t40 test-cases.d/30-010-odscc30t10 test-cases.d/30-020-odscc30t20 test-cases.d/30-030-odscc30t30 test-cases.d/30-040-odscc30t40 test-cases.d/40-010-odscc40t10 test-cases.d/40-040-odscc40t40 test-cases.d/40-060-odscc40t60 test-cases.d/40-080-odscc40t80 test-cases.d/40-100-odscc40t100 test-cases.d/50-010-odscc50t10 test-cases.d/50-020-odscc50t20 test-cases.d/50-030-odscc50t30 test-cases.d/50-040-odscc50t40 test-cases.d/50-050-odscc50t50 test-cases.d/50-060-odscc50t60 test-cases.d/enforcer.conf.multithread_basic test-cases.d/enforcer.ksmutil.update_ok test-cases.d/enforcer.policy.dual_policy_check test-cases.d/enforcer.zones.delete_with_keys test-cases.d/general.basic.start_sign_stop test-cases.d/general.basic.start_stop test-cases.d/general.kaspcheck.basic test-cases.d/general.pindaemon.log_on_and_off test-cases.d/general.repository.require_backup test-cases.d /general.repository.require_backup_and_do_backup test-cases.d/issue-0353 test-cases.d/signer.adapters.input_basic test-cases.d/signer.adapters.input_ixfr_notimpl test-cases.d/signer.adapters.input_retry_expires test-cases.d/signer.adapters.input_with_refresh test-cases.d/signer.adapters.output_basic test-cases.d/signer.adapters.output_with_notify test-cases.d/signer.conf.notify_command test-cases.d/signer.zones.opendnssec_0353 test-cases.d/signer.zones.validate_many_zones

commits at svn.opendnssec.org commits at svn.opendnssec.org
Mon Jan 21 14:40:21 CET 2013


Author: jerry
Date: Mon Jan 21 14:40:21 2013
New Revision: 6963
URL: http://fisheye.opendnssec.org/changelog/opendnssec?cs=6963

Log:
OPENDNSSEC-357: Updated test-cases.d with new naming of tests and support it in tests function.

Added:
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/enforcer.conf.multithread_basic/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.multithread_basic/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/enforcer.ksmutil.update_ok/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/enforcer.ksmutil.update_ok/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/enforcer.policy.dual_policy_check/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/enforcer.policy.dual_policy_check/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/enforcer.zones.delete_with_keys/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/enforcer.zones.delete_with_keys/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/general.basic.start_sign_stop/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/general.basic.start_sign_stop/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/general.basic.start_stop/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/general.basic.start_stop/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/general.kaspcheck.basic/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/general.kaspcheck.basic/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/general.pindaemon.log_on_and_off/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/general.pindaemon.log_on_and_off/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/general.repository.require_backup/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/general.repository.require_backup/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/general.repository.require_backup_and_do_backup/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/general.repository.require_backup_and_do_backup/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/signer.adapters.input_basic/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/signer.adapters.input_basic/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/signer.adapters.input_ixfr_notimpl/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/signer.adapters.input_ixfr_notimpl/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/signer.adapters.input_retry_expires/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/signer.adapters.input_retry_expires/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/signer.adapters.input_with_refresh/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/signer.adapters.input_with_refresh/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/signer.adapters.output_basic/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/signer.adapters.output_basic/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/signer.adapters.output_with_notify/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/signer.adapters.output_with_notify/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/signer.conf.notify_command/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.notify_command/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/signer.zones.opendnssec_0353/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/signer.zones.opendnssec_0353/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/signer.zones.validate_many_zones/
      - copied from r6962, trunk/OpenDNSSEC/testing/test-cases.d/signer.zones.validate_many_zones/
Deleted:
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/00-start-and-stop/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-010-odscc10t10/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-020-odscc10t20/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-030-odscc10t30/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-040-odscc10t40/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-050-odscc10t50/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-060-odscc10t60/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-070-odscc10t70/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-080-odscc10t80/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-090-odscc10t90/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-100-odscc10t100/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-110-odscc10t110/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-120-odscc10t120/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-130-odscc10t130/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-150-odscc10t150/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-160-odscc10t160/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-add-delete-zone/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-dual-policy-check-signconf/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-kaspcheck/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-ksmutil-update/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-multi-threaded-enforcer/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-pin-daemon/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/10-validate-test-zones/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/14-dns-input-adapter/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/14-dns-ixfr-notimpl/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/14-dns-output-adapter/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/14-dns-output-notify/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/14-dns-refresh/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/14-dns-retry-expire/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/20-010-odscc20t10/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/20-020-odscc20t20/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/20-030-odscc20t30/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/20-040-odscc20t40/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/30-010-odscc30t10/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/30-020-odscc30t20/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/30-030-odscc30t30/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/30-040-odscc30t40/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/40-010-odscc40t10/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/40-040-odscc40t40/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/40-060-odscc40t60/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/40-080-odscc40t80/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/40-100-odscc40t100/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/50-010-odscc50t10/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/50-020-odscc50t20/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/50-030-odscc50t30/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/50-040-odscc50t40/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/50-050-odscc50t50/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/50-060-odscc50t60/
   home/jerry/OpenDNSSEC-trunk-testing-junit/test-cases.d/issue-0353/
Modified:
   home/jerry/OpenDNSSEC-trunk-testing-junit/lib.sh

Modified: home/jerry/OpenDNSSEC-trunk-testing-junit/lib.sh
==============================================================================
--- home/jerry/OpenDNSSEC-trunk-testing-junit/lib.sh	Mon Jan 21 11:46:58 2013	(r6962)
+++ home/jerry/OpenDNSSEC-trunk-testing-junit/lib.sh	Mon Jan 21 14:40:21 2013	(r6963)
@@ -1456,11 +1456,11 @@
 	while read entry; do
 		if [ -d "$entry" -a -f "$entry/test.sh" ]; then
 		    if [ -f "$entry/off" ]; then
-		        test_name=`grep '#CATEGORY:' "$entry/test.sh"|sed 's%-\([^-]*\)$% \1%'|awk '{print $3}'`
+		        test_name=`echo "$entry"|sed 's%\.% %g'|awk '{print $3}'`
 		        if [ -z "$test_name" ]; then
 		            test_name='unknown'
 		        fi
-		        test_classname=`grep '#CATEGORY:' "$entry/test.sh"|sed 's%-\([^-]*\)$% \1%'|awk '{print $2}'|sed 's%-%.%'`
+		        test_classname=`echo "$entry"|sed 's%\.% %g'|awk '{print $1 "." $2}'`
 		        if [ -z "$test_classname" ]; then
 		            test_classname='unknown.unknown'
 		        fi
@@ -1497,11 +1497,11 @@
 		test_path="${test[test_iter]}"
 		test_iter=$(( test_iter + 1 ))
 		test_start=`date +%s`
-        test_name=`grep '#CATEGORY:' "$test_path/test.sh"|sed 's%-\([^-]*\)$% \1%'|awk '{print $3}'`
+        test_name=`echo "$test_path"|sed 's%\.% %g'|awk '{print $3}'`
         if [ -z "$test_name" ]; then
             test_name='unknown'
         fi
-        test_classname=`grep '#CATEGORY:' "$test_path/test.sh"|sed 's%-\([^-]*\)$% \1%'|awk '{print $2}'|sed 's%-%.%'`
+        test_classname=`echo "$test_path"|sed 's%\.% %g'|awk '{print $1 "." $2}'`
         if [ -z "$test_classname" ]; then
             test_classname='unknown.unknown'
         fi



More information about the Opendnssec-commits mailing list