[Opendnssec-commits] sara r7097 - in branches/OpenDNSSEC-1.3/testing/test-cases.d: enforcer.rollover.manual_rollover enforcer.rollover.manual_rollover_policy

commits at svn.opendnssec.org commits at svn.opendnssec.org
Wed Apr 17 10:56:44 CEST 2013


Author: sara
Date: Wed Apr 17 10:56:44 2013
New Revision: 7097
URL: http://fisheye.opendnssec.org/changelog/opendnssec?cs=7097

Log:
TEST(enforcer.rollover.manual_rolloverX): increase timeout waits on logs to keep solaris and ubuntu happy

Modified:
   branches/OpenDNSSEC-1.3/testing/test-cases.d/enforcer.rollover.manual_rollover/test.sh
   branches/OpenDNSSEC-1.3/testing/test-cases.d/enforcer.rollover.manual_rollover_policy/test.sh

Modified: branches/OpenDNSSEC-1.3/testing/test-cases.d/enforcer.rollover.manual_rollover/test.sh
==============================================================================
--- branches/OpenDNSSEC-1.3/testing/test-cases.d/enforcer.rollover.manual_rollover/test.sh	Wed Apr 17 10:04:35 2013	(r7096)
+++ branches/OpenDNSSEC-1.3/testing/test-cases.d/enforcer.rollover.manual_rollover/test.sh	Wed Apr 17 10:56:44 2013	(r7097)
@@ -45,7 +45,7 @@
 
 # ******************* Roll the ZSK first ************************ 
 log_this ods-ksmutil-key-rollover1 ods-ksmutil key rollover --zone ods --keytype ZSK &&
-syslog_grep "ods-ksmutil: Manual key rollover for key type zsk on zone ods initiated" &&
+syslog_waitfor 5 "ods-ksmutil: .*Manual key rollover for key type zsk on zone ods initiated" &&
 # *************************************************************** 
 
 # Run the enforcer and check for a published ZSK for our zone
@@ -115,7 +115,7 @@
 
 # ******************* Roll the KSK now ************************ 
 log_this ods-ksmutil-key-rollover2 ods-ksmutil key rollover --zone ods --keytype KSK &&
-syslog_grep "ods-ksmutil: Manual key rollover for key type ksk on zone ods initiated" &&
+syslog_waitfor 5 "ods-ksmutil: .*Manual key rollover for key type ksk on zone ods initiated" &&
 # *************************************************************
 
 # Run the enforcer
@@ -180,7 +180,7 @@
 # ********Lets roll for a policy and all key types now ************** 
 log_this ods-ksmutil-key-rollover_all ods-ksmutil key rollover --zone ods --all &&
 #echo "y" | log_this ods-ksmutil-key-rollover_all ods-ksmutil key rollover --policy default --all &&
-syslog_grep "ods-ksmutil: Manual key rollover for key type all on zone ods initiated" &&
+syslog_waitfor 5 "ods-ksmutil: .*Manual key rollover for key type all on zone ods initiated" &&
 # ******************************************************************* 
 
 # Run the enforcer
@@ -200,7 +200,7 @@
 # ******************* Now roll a zone which shares keys ************************ 
 echo "y" | log_this ods-ksmutil-key-rollover3 ods-ksmutil key rollover --zone ods2 --keytype ZSK &&
 log_grep ods-ksmutil-key-rollover3 stdout "This zone shares keys with others, all instances of the active key on this zone will be retired; are you sure?" &&
-syslog_grep "ods-ksmutil: Manual key rollover for key type zsk on zone ods2 initiated" &&
+syslog_waitfor 5 "ods-ksmutil: .*Manual key rollover for key type zsk on zone ods2 initiated" &&
 # ***************************************************************
 
 # Run the enforcer

Modified: branches/OpenDNSSEC-1.3/testing/test-cases.d/enforcer.rollover.manual_rollover_policy/test.sh
==============================================================================
--- branches/OpenDNSSEC-1.3/testing/test-cases.d/enforcer.rollover.manual_rollover_policy/test.sh	Wed Apr 17 10:04:35 2013	(r7096)
+++ branches/OpenDNSSEC-1.3/testing/test-cases.d/enforcer.rollover.manual_rollover_policy/test.sh	Wed Apr 17 10:56:44 2013	(r7097)
@@ -41,7 +41,7 @@
 
 # ******************* Roll the ZSK first ************************ 
 echo "y" | log_this ods-ksmutil-key-rollover1 ods-ksmutil key rollover --policy default --keytype ZSK &&
-syslog_grep "ods-ksmutil: Manual key rollover for key type zsk on policy default initiated" &&
+syslog_waitfor 5 "ods-ksmutil: .*Manual key rollover for key type zsk on policy default initiated" &&
 # *************************************************************** 
 
 # Run the enforcer and check for a published ZSK on our policy
@@ -111,7 +111,7 @@
 
 # ******************* Roll the KSK now ************************ 
 echo "y" | log_this ods-ksmutil-key-rollover2 ods-ksmutil key rollover --policy default --keytype KSK &&
-syslog_grep "ods-ksmutil: Manual key rollover for key type ksk on policy default initiated" &&
+syslog_waitfor 5 "ods-ksmutil: .*Manual key rollover for key type ksk on policy default initiated" &&
 # *************************************************************
 
 # Run the enforcer
@@ -175,7 +175,7 @@
 
 # ********Lets roll for a policy and all key types now ************** 
 echo "y" | log_this ods-ksmutil-key-rollover_all ods-ksmutil key rollover --policy default --all &&
-syslog_grep "ods-ksmutil: Manual key rollover for key type all on policy default initiated" &&
+syslog_waitfor 5 "ods-ksmutil: .*Manual key rollover for key type all on policy default initiated" &&
 # ******************************************************************* 
 
 # Run the enforcer



More information about the Opendnssec-commits mailing list