diff options
| author | Tom Yu <tlyu@mit.edu> | 2001-11-02 21:40:35 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2001-11-02 21:40:35 +0000 |
| commit | 7c7bbd644f1758b62f9f065f81501c23aaf2573e (patch) | |
| tree | 50b7f895a4a1fa878bc3e315831992bae5b83a45 /src | |
| parent | 3bea9d4e23cf1b0d188f8802aefc18d3c3940988 (diff) | |
| download | krb5-7c7bbd644f1758b62f9f065f81501c23aaf2573e.tar.gz krb5-7c7bbd644f1758b62f9f065f81501c23aaf2573e.tar.xz krb5-7c7bbd644f1758b62f9f065f81501c23aaf2573e.zip | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/tests/dejagnu/krb-standalone/ChangeLog | 6 | ||||
| -rw-r--r-- | src/tests/dejagnu/krb-standalone/rsh.exp | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog index 768c1b72f4..dc0eb52522 100644 --- a/src/tests/dejagnu/krb-standalone/ChangeLog +++ b/src/tests/dejagnu/krb-standalone/ChangeLog @@ -1,5 +1,11 @@ 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 wrong. So is calling exit. Fix to not do these things. Expect eof rather than "\r" so as to drain pty buffers and avoid diff --git a/src/tests/dejagnu/krb-standalone/rsh.exp b/src/tests/dejagnu/krb-standalone/rsh.exp index 802f5852c7..73b9f55341 100644 --- 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 |