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
 ------------------------------------------------------------------------

ticket: 6357
version_fixed: 1.7
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22008 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/testing/scripts/start_servers_local b/src/kadmin/testing/scripts/start_servers_local
index b787b57e3f788d2876a560c53f5d4dead27d2eaa..5c1df4c2652a9579f7d8b1b88ba8f8471ea0deee 100755 (executable)
--- a/src/kadmin/testing/scripts/start_servers_local
+++ b/src/kadmin/testing/scripts/start_servers_local
@@ -132,7 +132,7 @@ kdc_args="-R dfl:kdc_rcache.$USER"
 (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 @@ timewait_s=300
 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

diff --git a/src/lib/kadm5/unit-test/api.0/mod-principal.exp b/src/lib/kadm5/unit-test/api.0/mod-principal.exp
index d6a9cbc902e38faa4b3056e8cdc9cc61ded09948..2d68a19c11daf9006387b12429106cc3ece000a6 100644 (file)
--- a/src/lib/kadm5/unit-test/api.0/mod-principal.exp
+++ b/src/lib/kadm5/unit-test/api.0/mod-principal.exp
@@ -598,6 +598,7 @@ proc test20 {} {
     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"

diff --git a/src/lib/kadm5/unit-test/api.2/mod-principal.exp b/src/lib/kadm5/unit-test/api.2/mod-principal.exp
index 4472c78cee08aa6cf123f974aab2be1f1056d358..7c381c41ad1a920e0ec0a315fd4e00fae5d9c8e5 100644 (file)
--- a/src/lib/kadm5/unit-test/api.2/mod-principal.exp
+++ b/src/lib/kadm5/unit-test/api.2/mod-principal.exp
@@ -598,6 +598,7 @@ proc test20 {} {
     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"