svn rev #22008: branches/krb5-1-7/src/ kadmin/testing/scripts/ lib/kadm5/unit-test/api.0/ ...

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22008
Commit By: tlyu
Log Message:
ticket: 6357
version_fixed: 1.7
status: resolved

pull up r21865, r21866 from trunk

 ------------------------------------------------------------------------
 r21866 | raeburn | 2009-02-02 13:42:06 -0500 (Mon, 02 Feb 2009) | 8 lines
 Changed paths:
    M /trunk/src/lib/kadm5/unit-test/api.0/mod-principal.exp
    M /trunk/src/lib/kadm5/unit-test/api.2/mod-principal.exp

 ticket: 6357
 subject: address lib/kadm5 test suite slowness
 target_version: 1.7

 In mod-principal tests for clearing the principal's policy, instead of
 just testing to see if the wrong string is output and timing out
 looking for it, check also for the new expected value.  Cuts test
 suite run time by about two minutes for each pass (client vs server).
 ------------------------------------------------------------------------
 r21865 | raeburn | 2009-02-02 13:29:28 -0500 (Mon, 02 Feb 2009) | 1 line
 Changed paths:
    M /trunk/src/kadmin/testing/scripts/start_servers_local

 don't delay so long while waiting for daemon startup
 ------------------------------------------------------------------------


Changed Files:
U   branches/krb5-1-7/src/kadmin/testing/scripts/start_servers_local
U   branches/krb5-1-7/src/lib/kadm5/unit-test/api.0/mod-principal.exp
U   branches/krb5-1-7/src/lib/kadm5/unit-test/api.2/mod-principal.exp
Modified: branches/krb5-1-7/src/kadmin/testing/scripts/start_servers_local
===================================================================
--- branches/krb5-1-7/src/kadmin/testing/scripts/start_servers_local	2009-02-17 16:10:21 UTC (rev 22007)
+++ branches/krb5-1-7/src/kadmin/testing/scripts/start_servers_local	2009-02-17 16:10:53 UTC (rev 22008)
@@ -132,7 +132,7 @@
 (trap "" 2; cd $TOP/../kdc; ./krb5kdc $kdc_args; touch $kdc_start_file) \
 	< /dev/null > $usrtmp/kdc-log.$USER 2>&1 &
 
-s=10
+s=1
 max_s=60
 sofar_s=0
 timewait_s=300
@@ -140,7 +140,7 @@
 while true; do
 	rm -f $adm_start_file
 
-	(sleep 5; cd $TOP/server; ./kadmind $ovadm_args; \
+	(sleep 1; cd $TOP/server; ./kadmind $ovadm_args; \
 		touch $adm_start_file) < /dev/null > $usrtmp/kadm-log.$USER 2>&1 &
 
 	# wait until they start

Modified: branches/krb5-1-7/src/lib/kadm5/unit-test/api.0/mod-principal.exp
===================================================================
--- branches/krb5-1-7/src/lib/kadm5/unit-test/api.0/mod-principal.exp	2009-02-17 16:10:21 UTC (rev 22007)
+++ branches/krb5-1-7/src/lib/kadm5/unit-test/api.0/mod-principal.exp	2009-02-17 16:10:53 UTC (rev 22008)
@@ -598,6 +598,7 @@
     send "lindex \$principal 10\n"
     expect {
 	-re "test-pol\n$prompt$"	{ fail "$test" }
+	-re "null\n$prompt$"		{ pass "$test" }
 	timeout				{ pass "$test" }
     }
     send "lindex \$p1 6\n"

Modified: branches/krb5-1-7/src/lib/kadm5/unit-test/api.2/mod-principal.exp
===================================================================
--- branches/krb5-1-7/src/lib/kadm5/unit-test/api.2/mod-principal.exp	2009-02-17 16:10:21 UTC (rev 22007)
+++ branches/krb5-1-7/src/lib/kadm5/unit-test/api.2/mod-principal.exp	2009-02-17 16:10:53 UTC (rev 22008)
@@ -598,6 +598,7 @@
     send "lindex \$principal 10\n"
     expect {
 	-re "test-pol\n$prompt$"	{ fail "$test" }
+	-re "null\n$prompt$"		{ pass "$test" }
 	timeout				{ pass "$test" }
     }
     send "lindex \$p1 6\n"