* rcp.exp, rsh_exp (stop_rsh_daemon): Do not close a process and

	then look for eof. Some versions of expect go through a full
	timeout in this scenario and others return immediately. New order:
	kill process, expect eof, close, and then wait.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13866 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index 815bc108358ba09b5ced4edfbd0d29be9abdb5b5..c8d17c77a1fb8acc382a9249e8d43cfcc9a19d7d 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-26  Ezra Peisach  <epeisach@mit.edu>
+
+       * rcp.exp, rsh_exp (stop_rsh_daemon): Do not close a process and
+       then look for eof. Some versions of expect go through a full
+       timeout in this scenario and others return immediately. New order:
+       kill process, expect eof, close, and then wait.
+
 2001-10-25  Ezra Peisach  <epeisach@mit.edu>
 
        * rsh.exp (rsh_test): Add stop_rsh_daemon before invoking

diff --git a/src/tests/dejagnu/krb-standalone/rcp.exp b/src/tests/dejagnu/krb-standalone/rcp.exp
index 0c6d4df893c8475e2e706f349d141c0bd2285989..3367b3a2911f0c576ba079bbb45db723256bcb2d 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/rcp.exp
+++ b/src/tests/dejagnu/krb-standalone/rcp.exp
@@ -72,9 +72,9 @@ proc stop_rsh_daemon { } {
     global krshd_pid
 
     if [info exists krshd_pid] {
-       catch "close -i $krshd_spawn_id"
        catch "exec kill $krshd_pid"
        catch "expect -i $krshd_spawn_id eof"
+       catch "close -i $krshd_spawn_id"
        catch "wait -i $krshd_spawn_id"
        unset krshd_pid
     }

diff --git a/src/tests/dejagnu/krb-standalone/rsh.exp b/src/tests/dejagnu/krb-standalone/rsh.exp
index f847f60714dc365f0025ed33e62c90c8ecb054a6..802f5852c7d6640ba5f7b2a3cd33e341429bb9dc 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/rsh.exp
+++ b/src/tests/dejagnu/krb-standalone/rsh.exp
@@ -57,9 +57,9 @@ proc stop_rsh_daemon { } {
     global krshd_pid
 
     if [info exists krshd_pid] {
-       catch "close -i $krshd_spawn_id"
        catch "exec kill $krshd_pid"
        catch "expect -i $krshd_spawn_id eof"
+       catch "close -i $krshd_spawn_id"
        catch "wait -i $krshd_spawn_id"
        unset krshd_pid
     }