[Opendnssec-commits] sara r6935 - in trunk: OpenDNSSEC/testing/test-cases-daily.d/enforcer.keys.rollovers_many OpenDNSSEC/testing/test-cases-daily.d/signer.adaptors.bind_stress_test OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_hostname OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_name OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_password OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_port OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_user OpenDNSSEC/testing/test-cases.d/enforcer.conf.move_kasp_db OpenDNSSEC/testing/test-cases.d/enforcer.conf.multithread_basic OpenDNSSEC/testing/test-cases.d/enforcer.conf.privileges_nonexistant_user OpenDNSSEC/testing/test-cases.d/enforcer.conf.privileges_ok_user OpenDNSSEC/testing/test-cases.d/enforcer.conf.short_interval OpenDNSSEC/testing/test-cases.d/enforcer.ksmutil.update_ok OpenDNSSEC/testing/test-cases.d/enforcer.policy.dual_policy_check OpenDNSSEC/testing/test-cases.d/enforcer.zones.delete_with_keys OpenDNSSEC/testing/test-cases.d/genera l.basic.start_sign_stop OpenDNSSEC/testing/test-cases.d/general.basic.start_stop OpenDNSSEC/testing/test-cases.d/general.conf.change_logging_ok OpenDNSSEC/testing/test-cases.d/general.conf.invalid_logging OpenDNSSEC/testing/test-cases.d/general.conf.move_kasp_xml OpenDNSSEC/testing/test-cases.d/general.conf.move_zonelist_xml OpenDNSSEC/testing/test-cases.d/general.kaspcheck.basic OpenDNSSEC/testing/test-cases.d/general.pindaemon.log_on_and_off OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_0 OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_1 OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_10000 OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_4 OpenDNSSEC/testing/test-cases.d/general.repository.module_missing OpenDNSSEC/testing/test-cases.d/general.repository.module_wrong OpenDNSSEC/testing/test-cases.d/general.repository.multiple_repositories OpenDNSSEC/testing/test-cases.d/general.repository.pin_incorrect_01 OpenDNSSEC/tes ting/test-cases.d/general.repository.pin_incorrect_02 OpenDNSSEC/testing/test-cases.d/general.repository.pin_missing OpenDNSSEC/testing/test-cases.d/general.repository.require_backup OpenDNSSEC/testing/test-cases.d/general.repository.require_backup_and_do_backup OpenDNSSEC/testing/test-cases.d/general.repository.token_1_char OpenDNSSEC/testing/test-cases.d/general.repository.token_many_chars OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_basic OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_ixfr_notimpl OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_retry_expires OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_with_refresh OpenDNSSEC/testing/test-cases.d/signer.adaptors.opendnssec_0353 OpenDNSSEC/testing/test-cases.d/signer.adaptors.output_basic OpenDNSSEC/testing/test-cases.d/signer.adaptors.output_with_notify OpenDNSSEC/testing/test-cases.d/signer.conf.move_directories OpenDNSSEC/testing/test-cases.d/signer.conf.notify_command OpenDNSSEC/testing/test-case s.d/signer.conf.privileges_nonexistant_user OpenDNSSEC/testing/test-cases.d/signer.conf.privileges_ok_user OpenDNSSEC/testing/test-cases.d/signer.conf.threads_of_1 OpenDNSSEC/testing/test-cases.d/signer.conf.threads_of_32 OpenDNSSEC/testing/test-cases.d/signer.zones.validate_many_zones testing

commits at svn.opendnssec.org commits at svn.opendnssec.org
Thu Jan 10 15:32:19 CET 2013


Author: sara
Date: Thu Jan 10 15:32:19 2013
New Revision: 6935
URL: http://fisheye.opendnssec.org/changelog/opendnssec?cs=6935

Log:
TEST: Remove the #CATEGORY comment from the tests. The test name should be self explanatory.

Modified:
   trunk/OpenDNSSEC/testing/test-cases-daily.d/enforcer.keys.rollovers_many/test.sh
   trunk/OpenDNSSEC/testing/test-cases-daily.d/signer.adaptors.bind_stress_test/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_hostname/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_name/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_password/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_port/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_user/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.move_kasp_db/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.multithread_basic/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.privileges_nonexistant_user/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.privileges_ok_user/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.short_interval/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/enforcer.ksmutil.update_ok/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/enforcer.policy.dual_policy_check/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/enforcer.zones.delete_with_keys/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.basic.start_sign_stop/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.basic.start_stop/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.conf.change_logging_ok/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.conf.invalid_logging/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.conf.move_kasp_xml/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.conf.move_zonelist_xml/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.kaspcheck.basic/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.pindaemon.log_on_and_off/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_0/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_1/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_10000/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_4/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.repository.module_missing/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.repository.module_wrong/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.repository.multiple_repositories/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.repository.pin_incorrect_01/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.repository.pin_incorrect_02/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.repository.pin_missing/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.repository.require_backup/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.repository.require_backup_and_do_backup/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.repository.token_1_char/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/general.repository.token_many_chars/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_basic/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_ixfr_notimpl/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_retry_expires/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_with_refresh/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.opendnssec_0353/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.output_basic/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.output_with_notify/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.move_directories/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.notify_command/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.privileges_nonexistant_user/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.privileges_ok_user/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.threads_of_1/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.threads_of_32/test.sh
   trunk/OpenDNSSEC/testing/test-cases.d/signer.zones.validate_many_zones/test.sh
   trunk/testing/generate_test_case_info.sh

Modified: trunk/OpenDNSSEC/testing/test-cases-daily.d/enforcer.keys.rollovers_many/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases-daily.d/enforcer.keys.rollovers_many/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases-daily.d/enforcer.keys.rollovers_many/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -5,9 +5,6 @@
 #TEST: Checks the output of ods-ksmutil key list and the signconf.xml contents
 #TEST: Takes about 10 mins and follows several KSK and ZKK rollovers.
 
-
-#CATEGORY: enforcer-rollovers-check_many_rollovers_test
-
 #TODO: - increase number of steps?
 #TODO: - check more logging in syslog
 #TODO: - fix the compare script to directly compare the key ids in the signconf

Modified: trunk/OpenDNSSEC/testing/test-cases-daily.d/signer.adaptors.bind_stress_test/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases-daily.d/signer.adaptors.bind_stress_test/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases-daily.d/signer.adaptors.bind_stress_test/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Stresstest OpenDNSSEC: Many notifies and no updates may go missing.
 
-#CATEGORY: signer-adapters-input_dns_many_updates
-
 # Start with some BIND9 config
 BIND9_TEST_ROOTDIR=`pwd`
 BIND9_NAMED_CONFDIR=$BIND9_TEST_ROOTDIR/bind9

Modified: trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_hostname/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_hostname/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_hostname/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Change the Hostname for database and check if enforcer fails to connect
 
-#CATEGORY: enforcer-conf-change_db_hostname
-
 #TODO: Merge with 40-010 (change_db_port)?
 
 if [ -z "$HAVE_MYSQL" ]; then

Modified: trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_name/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_name/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_name/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Change the database name for database and check if enforcer fails to connect
 
-#CATEGORY: enforcer-conf-change_db_database_name
-
 #TODO: Merge with 40-010 (change_db_port)?
 
 if [ -z "$HAVE_MYSQL" ]; then

Modified: trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_password/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_password/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_password/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Change the password for database and check if enforcer fails to connect
 
-#CATEGORY: enforcer-conf-change_db_password
-
 #TODO: Merge with 40-010 (change_db_port)?
 
 if [ -z "$HAVE_MYSQL" ]; then

Modified: trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_port/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_port/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_port/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Change port of database and check if enforcer fails to connect
 
-#CATEGORY: enforcer-conf-change_db_port
-
 if [ -z "$HAVE_MYSQL" ]; then
 	return 0
 fi &&

Modified: trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_user/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_user/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.db_user/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Change the username for database and check if enforcer fails to connect
 
-#CATEGORY: enforcer-conf-change_db_user_name
-
 #TODO: Merge with 40-010 (change_db_port)?
 
 if [ -z "$HAVE_MYSQL" ]; then

Modified: trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.move_kasp_db/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.move_kasp_db/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.move_kasp_db/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Change the kasp.db location and change Datastore in conf.xml accordingly
 
-#CATEGORY: enforcer-conf-change_kasp_db_location
-
 if [ -n "$HAVE_MYSQL" ]; then
 	return 0
 fi &&

Modified: trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.multithread_basic/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.multithread_basic/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.multithread_basic/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -3,8 +3,6 @@
 #TEST: Configure and sign 4 zones with one repository using multi-threaded Enforcer
 #TEST: and 3 different policies, 1 with shared keys and 2 without.
 
-#CATEGORY: enforcer-multi-threaded_basic_test
-
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml
 fi &&

Modified: trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.privileges_nonexistant_user/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.privileges_nonexistant_user/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.privileges_nonexistant_user/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -4,8 +4,6 @@
 
 #TEST: NOTE NOTE NOTE - Test system today runs under a normal user, this test needs to be changed or allowed root access to test setuid functionallity
 
-#CATEGORY: enforcer-privileges-user_doesnt_exist
-
 ods_reset_env &&
 echo 'Privileges have been adjusted in the conf.xml. User opendnssec1 is specified, which does not exist on the unix system.' &&
 echo 'Stop the ODS-Enforcer and ODS-Signer' &&

Modified: trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.privileges_ok_user/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.privileges_ok_user/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.privileges_ok_user/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -4,8 +4,6 @@
 
 #TEST: NOTE NOTE NOTE - Test system today runs under a normal user, this test needs to be changed or allowed root access to test setuid functionallity
 
-#CATEGORY: enforcer-privileges-user_exists
-
 ods_reset_env &&
 echo 'Privileges have been adjusted in the conf.xml. User opendnssec is specified, which exists on the unix system.' &&
 echo 'Stop the ODS-Enforcer and ODS-Signer' &&

Modified: trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.short_interval/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.short_interval/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/enforcer.conf.short_interval/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Change the Interval to 4 seconds and check if the enforcer runs 4 times
 
-#CATEGORY: enforcer-conf-short_interval
-
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/enforcer.ksmutil.update_ok/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/enforcer.ksmutil.update_ok/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/enforcer.ksmutil.update_ok/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Test that a ksmutil update call HUPs the enforcerd
 
-#CATEGORY: enforcer-ksmutil-update
-
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml
 fi &&

Modified: trunk/OpenDNSSEC/testing/test-cases.d/enforcer.policy.dual_policy_check/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/enforcer.policy.dual_policy_check/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/enforcer.policy.dual_policy_check/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,7 +2,6 @@
 
 #TEST: Test 2 zones on separate policies, check the signconfs look reasonable
 
-#CATEGORY: enforcer-policies-dual_policy_check_signconf
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/enforcer.zones.delete_with_keys/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/enforcer.zones.delete_with_keys/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/enforcer.zones.delete_with_keys/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Test deletion of zones with keys.
 
-#CATEGORY: enforcer-zones-delete_zones_with_keys
-
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml
 fi &&

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.basic.start_sign_stop/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.basic.start_sign_stop/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.basic.start_sign_stop/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Start, sign a single zone with one repository, stop. 
 
-#CATEGORY: general-basic-start_sign_stop
-
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml
 fi &&

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.basic.start_stop/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.basic.start_stop/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.basic.start_stop/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Start and stop using ods-control and default conf files. Check the deamons behave.
 
-#CATEGORY: general-basic-start_and_stop
-
 ods_reset_env &&
 
 log_this_timeout ods-control-start 60 ods-control start &&

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.conf.change_logging_ok/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.conf.change_logging_ok/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.conf.change_logging_ok/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Set logging to a different channel and check if only the new channel receives ODS logging
 
-#CATEGORY: general-common-change_logging_channel
-
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml
 fi &&

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.conf.invalid_logging/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.conf.invalid_logging/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.conf.invalid_logging/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,7 +2,6 @@
 
 #TEST: Set logging to a invalid channel and expect failure.
 
-#CATEGORY: general-common-fail_invalid_logging_channel
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.conf.move_kasp_xml/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.conf.move_kasp_xml/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.conf.move_kasp_xml/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,7 +2,6 @@
 
 #TEST: Change the kasp.xml location and change PolicyFile in conf.xml accordingly
 
-#CATEGORY: general-common-change_kasp_xml_location
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.conf.move_zonelist_xml/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.conf.move_zonelist_xml/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.conf.move_zonelist_xml/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Change the zonelist.xml location and change ZoneListFile in conf.xml accordingly
 
-#CATEGORY: general-common-change_zonelist_xml_location
-
 #TODO: Merge with 20-030 (change_kasp_xml_location)?
 
 if [ -n "$HAVE_MYSQL" ]; then

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.kaspcheck.basic/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.kaspcheck.basic/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.kaspcheck.basic/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -3,8 +3,6 @@
 #TEST: Test kaspcheck with different input files - some good, some bad
 #TEST: This test case only runs kaspcheck, it does not run ods.
 
-#CATEGORY: general-kaspcheck-good_and_bad_xml
-
 ods_reset_env &&
 
 # 1) Test with a good set of xml files

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.pindaemon.log_on_and_off/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.pindaemon.log_on_and_off/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.pindaemon.log_on_and_off/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -4,8 +4,6 @@
 #TEST: Configure no PIN while PIN is needed, expect failure
 #TEST: Then login and start everything successfully
 
-#CATEGORY: general-pin_deamon-basic_test
-
 # Make sure the PIN is cleared from shared memory
 log_this clear-pin ods-hsmutil logout
 

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_0/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_0/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_0/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Use a Repository Capacity of 0 and expect failure
 
-#CATEGORY: general-repository-fail_capacity_0
-
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_1/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_1/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_1/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,7 +2,6 @@
 
 #TEST: Use a Repository Capacity of 1 and expect failure
 
-#CATEGORY: general-repository-fail_capacity_1
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_10000/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_10000/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_10000/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Use a Repository Capacity of 100000 and expect success
 
-#CATEGORY: general-repository-capacity_100000
-
 #TODO: Merge with 10-020 (many_repositories)?
 
 if [ -n "$HAVE_MYSQL" ]; then

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_4/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_4/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.repository.capacity_of_4/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Use a Repository Capacity of 4 and expect success
 
-#CATEGORY: general-repository-capacity_4
-
 #TODO: Merge with 10-020 (many_repositories)?
 
 if [ -n "$HAVE_MYSQL" ]; then

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.repository.module_missing/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.repository.module_missing/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.repository.module_missing/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,7 +2,6 @@
 
 #TEST: Configure no repository module location and expect failure 
 
-#CATEGORY: general-repository-fail_no_module
 
 ods_reset_env &&
 

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.repository.module_wrong/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.repository.module_wrong/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.repository.module_wrong/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Configure wrong repository module location and expect failure 
 
-#CATEGORY: general-repository-fail_wrong_module
-
 #TODO: Merge with 10-030 (fail_no_module)?
 
 ods_reset_env &&

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.repository.multiple_repositories/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.repository.multiple_repositories/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.repository.multiple_repositories/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,7 +2,6 @@
 
 #TEST: Configure 4 repositories and sign a single zone using 2 of these different repositories. 
 
-#CATEGORY: general-repository-multiple_repositories
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.repository.pin_incorrect_01/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.repository.pin_incorrect_01/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.repository.pin_incorrect_01/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Use correct PIN plus one additional character while PIN is needed, expect failure
 
-#CATEGORY: general-repository-fail_incorrect_pin2
-
 #TODO: Merge with 10-080 (fail_incorrect_pin)?
 
 if [ -n "$HAVE_MYSQL" ]; then

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.repository.pin_incorrect_02/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.repository.pin_incorrect_02/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.repository.pin_incorrect_02/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Configure incorrect PIN while PIN is needed, expect failure
 
-#CATEGORY: general-repository-fail_incorrect_pin
-
 #TODO: Merge with 10-070 (fail_no_pin)?
 
 if [ -n "$HAVE_MYSQL" ]; then

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.repository.pin_missing/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.repository.pin_missing/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.repository.pin_missing/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Configure no PIN while PIN is needed, expect failure
 
-#CATEGORY: general-repository-fail_as_no_pin
-
 
 ods_reset_env &&
 

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.repository.require_backup/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.repository.require_backup/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.repository.require_backup/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: RequireBackup turned on and check that non-backedup keys are not used if backup not done.
 
-#CATEGORY: general-repository-fail_require_backup
-
 #TODO: Remove as duplicates first part of 10-160 (require_backup)
 
 if [ -n "$HAVE_MYSQL" ]; then

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.repository.require_backup_and_do_backup/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.repository.require_backup_and_do_backup/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.repository.require_backup_and_do_backup/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,7 +2,6 @@
 
 #TEST: RequireBackup turned on and check that non-backedup keys are not used if backup not done. Then back the keys up and check the zone is signed OK.
 
-#CATEGORY: general-repository-keys-require_backup
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.repository.token_1_char/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.repository.token_1_char/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.repository.token_1_char/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Use a Tokenlabel with 1 character, sign a single zone.
 
-#CATEGORY: general-repository-single_char_token
-
 #TODO: Merge with 10-020 (many_repositories)?
 
 if [ -n "$HAVE_MYSQL" ]; then

Modified: trunk/OpenDNSSEC/testing/test-cases.d/general.repository.token_many_chars/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/general.repository.token_many_chars/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/general.repository.token_many_chars/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,8 +2,6 @@
 
 #TEST: Use a Tokenlabel with 30 character, sign a single zone.
 
-#CATEGORY: general-repository-30_char_token
-
 #TODO: Merge with 10-020 (many_repositories)?
 
 if [ -n "$HAVE_MYSQL" ]; then

Modified: trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_basic/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_basic/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_basic/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -3,7 +3,6 @@
 #TEST: Test basic Input DNS Adapter
 #TEST: Start OpenDNSSEC and see if zone gets transferred and signed.
 
-#CATEGORY: signer-adapters-input_dns
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_ixfr_notimpl/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_ixfr_notimpl/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_ixfr_notimpl/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -4,7 +4,6 @@
 #TEST: Start OpenDNSSEC and see if zone gets transferred and signed.
 #TEST: Check we can support NOTIMPL from nameserver
 
-#CATEGORY: signer-adapters-input_dns_notimpl
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_retry_expires/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_retry_expires/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_retry_expires/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -4,8 +4,6 @@
 #TEST: Start OpenDNSSEC and see if zone gets transferred and signed
 #TEST: and then see what happens with retries fail and the expire time passes.
 
-#CATEGORY: signer-adapters-input_output_dns_retry_expire
-
 ## It requires setting up a zone in OpenDNSSEC with Input DNS Adapter,
 ## non-default zonelist.xml, non-default conf.xml, additional addns.xml.
 ## It requires setting up a primary name server (ldns-testns).

Modified: trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_with_refresh/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_with_refresh/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.input_with_refresh/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -4,8 +4,6 @@
 #TEST: Start OpenDNSSEC and see if zone gets transferred and signed
 #TEST: and see if refresh is being done.
 
-#CATEGORY: signer-adapters-input_dns_refresh
-
 ## It requires setting up a zone in OpenDNSSEC with Input DNS Adapter,
 ## non-default zonelist.xml, non-default conf.xml, additional addns.xml.
 ## It requires setting up a primary name server (ldns-testns).

Modified: trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.opendnssec_0353/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.opendnssec_0353/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.opendnssec_0353/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-#CATEGORY: signer-adaptors-empty-non-terminals
-
 #TEST:Test basic Output DNS Adapter
 #TEST: Start OpenDNSsEC, see if the zone gets signed and see if NOTIFY
 #TEST: messages are send. 

Modified: trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.output_basic/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.output_basic/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.output_basic/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -4,7 +4,6 @@
 #TEST: Start OpenDNSSEC and see if zone gets transferred and signed
 #TEST: and see if NOTIFY messages are sent. 
 
-#CATEGORY: signer-adapters-output_dns
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.output_with_notify/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.output_with_notify/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/signer.adaptors.output_with_notify/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -7,7 +7,6 @@
 #TEST: Start OpenDNSSEC and see if zone gets transferred and signed
 #TEST: and see if NOTIFY messages are sent and accepted.
 
-#CATEGORY: signer-adapters-output_dns_notify
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.move_directories/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.move_directories/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.move_directories/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,7 +2,6 @@
 
 #TEST: Change the /tmp location and change WorkingDirectory in conf.xml accordingly
 
-#CATEGORY: signer-conf-change_tmp_and_working_dir
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.notify_command/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.notify_command/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.notify_command/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,7 +2,6 @@
 
 #TEST: Use a simple script as NotifyCommand and check if it is executed after signing
 
-#CATEGORY: signer-conf-notify_command
 
 cat >"$INSTALL_ROOT/var/opendnssec/tmp/test-notify-command.sh" 2>/dev/null <<"EOF"
 #!/usr/bin/env bash

Modified: trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.privileges_nonexistant_user/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.privileges_nonexistant_user/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.privileges_nonexistant_user/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -4,7 +4,6 @@
 
 #TEST: NOTE NOTE NOTE - Test system today runs under a normal user, this test needs to be changed or allowed root access to test setuid functionallity
 
-#CATEGORY: signer-privileges-user_doesnt_exist
 
 ods_reset_env &&
 echo 'Privileges have been adjusted for the signer in the conf.xml. User = opendnssec; Group = opendnssec. This user and group do not have acces to the correct folder.' &&

Modified: trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.privileges_ok_user/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.privileges_ok_user/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.privileges_ok_user/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -4,7 +4,6 @@
 
 #TEST: NOTE NOTE NOTE - Test system today runs under a normal user, this test needs to be changed or allowed root access to test setuid functionallity
 
-#CATEGORY: signer-privileges-user_exists
 
 ods_reset_env &&
 echo 'Privileges have been adjusted for the signer in the conf.xml. User = ods; Group = ods. This user and group do not have acces to the correct folder.' &&

Modified: trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.threads_of_1/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.threads_of_1/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.threads_of_1/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,7 +2,6 @@
 
 #TEST: Change WorkerThreads to 1 and check if only 1 thread is used
 
-#CATEGORY: signer-conf-1_worker_thread
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.threads_of_32/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.threads_of_32/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/signer.conf.threads_of_32/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -2,7 +2,6 @@
 
 #TEST: Change WorkerThreads to 32 and check if 32 threads are used
 
-#CATEGORY: signer-conf-32_worker_threads
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/OpenDNSSEC/testing/test-cases.d/signer.zones.validate_many_zones/test.sh
==============================================================================
--- trunk/OpenDNSSEC/testing/test-cases.d/signer.zones.validate_many_zones/test.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/OpenDNSSEC/testing/test-cases.d/signer.zones.validate_many_zones/test.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -5,7 +5,6 @@
 #TEST: Will eventually add validation into this to check the output
 #TEST: For now use it to check any signing bugs with explicit tests
 
-#CATEGORY: signer-zones-validate_test_zone_data
 
 if [ -n "$HAVE_MYSQL" ]; then
 	ods_setup_conf conf.xml conf-mysql.xml

Modified: trunk/testing/generate_test_case_info.sh
==============================================================================
--- trunk/testing/generate_test_case_info.sh	Thu Jan 10 15:32:16 2013	(r6934)
+++ trunk/testing/generate_test_case_info.sh	Thu Jan 10 15:32:19 2013	(r6935)
@@ -18,12 +18,11 @@
 	fi
 	# Replace any commas with dashes since we will write to a csv file	
 	test_description=`grep "^#TEST:" test.sh | sed s/#TEST://g | sed s/,/-/g` 
-	test_category=`grep "^#CATEGORY:" test.sh | sed s/#CATEGORY://g | sed s/,/-/g`
 	# Just extract the issue identifier
 	test_issues=`grep "^#OPENDNSSEC\|^#SUPPORT" test.sh | sed s/#//g | sed 's/ .*//' `
 	test_todo=`grep "^#TODO:" test.sh | sed s/#TODO://g | sed s/,/-/g` 
 	
- 	echo $1","$test_path","$test_status","$test_category","$test_description","$test_issues","$test_todo >> $OUTPUT_FILE
+ 	echo $1","$test_path","$test_status","$test_description","$test_issues","$test_todo >> $OUTPUT_FILE
 
 }
 
@@ -49,7 +48,7 @@
 echo "Searching top level directory "$pwd" for tests"
 OUTPUT_FILE=$pwd/$OUTPUT_FILE_NAME
 rm $OUTPUT_FILE
-echo "Directory,Name,Status,Category,Description,Issues,To do" > $OUTPUT_FILE
+echo "Directory,Name,Status,Description,Issues,To do" > $OUTPUT_FILE
 
 for LOCAL_TEST_DIR in test-cases.d test-cases-daily.d test-cases-weekly.d; do
 



More information about the Opendnssec-commits mailing list