* rsh.exp: Fix date grabbing code so we don't try to parse the

	timezone-less date out of of a syslog message.  expect eof in
	places to drain pty buffers and avoid deadlock.

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

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index 768c1b72f49ab8e57a89a46861ed00ade51e4090..dc0eb52522e9d357dbaefd97ba12d3eb9da8291a 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-02  Tom Yu  <tlyu@mit.edu>
+
+       * rsh.exp: Fix date grabbing code so we don't try to parse the
+       timezone-less date out of of a syslog message.  expect eof in
+       places to drain pty buffers and avoid deadlock.
+
 2001-11-02  Tom Yu  <tlyu@mit.edu>
 
        * v4gssftp.exp: Calling send_error from within a dejagnu test is

diff --git a/src/tests/dejagnu/krb-standalone/rsh.exp b/src/tests/dejagnu/krb-standalone/rsh.exp
index 802f5852c7d6640ba5f7b2a3cd33e341429bb9dc..73b9f5534121a51b8216ef6e832ef00e23a9d8de 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/rsh.exp
+++ b/src/tests/dejagnu/krb-standalone/rsh.exp
@@ -97,7 +97,7 @@ proc rsh_test { } {
     set testname "date"
     spawn $RSH $hostname -k $REALMNAME -D 3544 -A date
     expect {
-       -re "\[A-Za-z0-9 :\]+\[\r\n\]+$" {
+       -re "\[A-Za-z0-9\]+ \[A-Za-z0-9\]+ +\[0-9\]+ \[0-9\]{2}:\[0-9\]{2}:\[0-9\]{2} \[A-Za-z0-9\]+ \[0-9\]{4}\r\n" {
            set result $expect_out(0,string)
        }
        timeout {
@@ -130,7 +130,7 @@ proc rsh_test { } {
     set testname "encrypted rsh"
     spawn $RSH $hostname -x -k $REALMNAME -D 3544 -A echo hello
     expect {
-       "hello" { }
+       "hello" { expect eof }
        timeout {
            fail "$testname (timeout)"
            set failed yes
@@ -225,7 +225,7 @@ proc rsh_test { } {
     set testname "rsh to stderr"
     spawn $RSH $hostname -k $REALMNAME -D 3544 -A $BINSH -c "'echo hello 1>&2'"
     expect {
-       "hello" { }
+       "hello" { expect eof }
        timeout {
            fail "$testname (timeout)"
            return
@@ -248,7 +248,7 @@ proc rsh_test { } {
     set testname "encrypted rsh to stderr"
     spawn $RSH $hostname -x -k $REALMNAME -D 3544 -A $BINSH -c "'echo hello 1>&2'"
     expect {
-       "hello" { }
+       "hello" { expect eof }
        timeout {
            fail "$testname (timeout)"
            return