diff options
author | Tom Yu <tlyu@mit.edu> | 2001-11-02 20:03:00 +0000 |
---|---|---|
committer | Tom Yu <tlyu@mit.edu> | 2001-11-02 20:03:00 +0000 |
commit | 3bea9d4e23cf1b0d188f8802aefc18d3c3940988 (patch) | |
tree | e92bd35bafe5b0824545ccc90ff3102e8e8d83a7 /src | |
parent | 6b986c00ab36f6fac040ca38fdf974af4f26dbd6 (diff) | |
download | krb5-3bea9d4e23cf1b0d188f8802aefc18d3c3940988.tar.gz krb5-3bea9d4e23cf1b0d188f8802aefc18d3c3940988.tar.xz krb5-3bea9d4e23cf1b0d188f8802aefc18d3c3940988.zip |
* 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
deadlock.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13931 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r-- | src/tests/dejagnu/krb-standalone/ChangeLog | 7 | ||||
-rw-r--r-- | src/tests/dejagnu/krb-standalone/v4gssftp.exp | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog index 59eaae32cb..768c1b72f4 100644 --- a/src/tests/dejagnu/krb-standalone/ChangeLog +++ b/src/tests/dejagnu/krb-standalone/ChangeLog @@ -1,5 +1,12 @@ 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 + deadlock. + +2001-11-02 Tom Yu <tlyu@mit.edu> + * gssftp.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/v4gssftp.exp b/src/tests/dejagnu/krb-standalone/v4gssftp.exp index 859cce4706..7026aa6b37 100644 --- a/src/tests/dejagnu/krb-standalone/v4gssftp.exp +++ b/src/tests/dejagnu/krb-standalone/v4gssftp.exp @@ -455,7 +455,8 @@ proc v4ftp_test { } { set testname "quit(v4)" send "quit\r" - expect "\r" + expect_after + expect eof if [check_exit_status $testname] { pass $testname } @@ -494,7 +495,5 @@ if [info exists home] { } if { $status != 0 } { - send_error "ERROR: error in ftp.exp\n" - send_error "$msg\n" - exit 1 + perror "error in gssftp.exp: $msg" } |