* 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

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index c8d17c77a1fb8acc382a9249e8d43cfcc9a19d7d..59eaae32cbe82ba5cc439c9df29ca6db20c85412 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,10 @@
+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
+       deadlock.
+
 2001-10-26  Ezra Peisach  <epeisach@mit.edu>
 
        * 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 d0b49d320d1cea80c5882cebf28631e011e0e140..800a40f43b9d0949d1e0a7769195650e403a5d4f 100644 (file)
--- 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"
 }