From 6b986c00ab36f6fac040ca38fdf974af4f26dbd6 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Fri, 2 Nov 2001 19:06:52 +0000 Subject: * 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 deadlock. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13928 dc483132-0cff-0310-8789-dd5450dbe970 --- src/tests/dejagnu/krb-standalone/ChangeLog | 7 +++++++ src/tests/dejagnu/krb-standalone/gssftp.exp | 7 +++---- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src/tests') diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog index c8d17c7..59eaae3 100644 --- a/src/tests/dejagnu/krb-standalone/ChangeLog +++ b/src/tests/dejagnu/krb-standalone/ChangeLog @@ -1,3 +1,10 @@ +2001-11-02 Tom Yu + + * 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 + deadlock. + 2001-10-26 Ezra Peisach * rcp.exp, rsh_exp (stop_rsh_daemon): Do not close a process and diff --git a/src/tests/dejagnu/krb-standalone/gssftp.exp b/src/tests/dejagnu/krb-standalone/gssftp.exp index d0b49d3..800a40f 100644 --- a/src/tests/dejagnu/krb-standalone/gssftp.exp +++ b/src/tests/dejagnu/krb-standalone/gssftp.exp @@ -398,7 +398,8 @@ proc ftp_test { } { set testname "quit" send "quit\r" - expect "\r" + expect_after + expect eof if [check_exit_status $testname] { pass $testname } @@ -436,7 +437,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" } -- cgit v1.1