diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-10-10 13:11:46 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-10-10 13:14:15 -0400 |
| commit | fd243aa274c6ba315280703aac9bd653f76197c4 (patch) | |
| tree | c23139c84010b91355b94830ce770d6e54b0acc4 /src/tests | |
| parent | 3fe2761dbe83583c217a2e4663fadfe4eb3d3bfc (diff) | |
| download | krb5-fd243aa274c6ba315280703aac9bd653f76197c4.tar.gz krb5-fd243aa274c6ba315280703aac9bd653f76197c4.tar.xz krb5-fd243aa274c6ba315280703aac9bd653f76197c4.zip | |
Fix slow kprop dejagnu test
Fix kpropd -S -t to actually exit after processing one connection (it
was breaking out of the switch statement, not the while loop). Use
the -t when invoking kpropd from the dejagnu test framework;
previously it was unnecessary because kpropd -S -d exited after one
connection. Clear up some confusion in the kprop.exp comments about
whether kpropd is expected to exit.
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/dejagnu/config/default.exp | 2 | ||||
| -rw-r--r-- | src/tests/dejagnu/krb-standalone/kprop.exp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp index 67963c579a..bd45ecef3a 100644 --- a/src/tests/dejagnu/config/default.exp +++ b/src/tests/dejagnu/config/default.exp @@ -1510,7 +1510,7 @@ proc start_kpropd {} { envstack_push setup_kerberos_env slave - spawn $KPROPD -S -d -P [expr 10 + $portbase] -s $tmppwd/srvtab -f $tmppwd/incoming-slave-datatrans -p $KDB5_UTIL -a $tmppwd/kpropd-acl + spawn $KPROPD -S -d -t -P [expr 10 + $portbase] -s $tmppwd/srvtab -f $tmppwd/incoming-slave-datatrans -p $KDB5_UTIL -a $tmppwd/kpropd-acl set kpropd_pid [exp_pid] set kpropd_spawn_id $spawn_id # send_user [list $KPROPD -S -d -P [expr 10 + $portbase] -s $tmppwd/srvtab -f $tmppwd/incoming-slave-datatrans -p $KDB5_UTIL -a $tmppwd/kpropd-acl]\n diff --git a/src/tests/dejagnu/krb-standalone/kprop.exp b/src/tests/dejagnu/krb-standalone/kprop.exp index ed7ed684f9..cc1a26a287 100644 --- a/src/tests/dejagnu/krb-standalone/kprop.exp +++ b/src/tests/dejagnu/krb-standalone/kprop.exp @@ -24,13 +24,11 @@ proc setup_slave {} { proc scan_kpropd_output {} { global kpropd_spawn_id kpropd_pid - # See if kpropd logged anything. + # See if kpropd logged anything. It should exit after processing + # one kprop connection. expect { -i $kpropd_spawn_id eof { - # I think kpropd is supposed to run a loop in standalone - # mode, but exiting seems to be normal behavior. -# fail "kprop (server exited)" wait -i $kpropd_spawn_id unset kpropd_spawn_id kpropd_pid } |