* standalone.exp: Use $KLIST -5 and $KDESTROY -5 to deal with

	changed behavior in these programs.  Wait for eof in some cases to
	avoid hanging.

	* rsh.exp: Wait for eof to prevent hanging.

	* gssapi.exp: Use $KINIT -5 to deal with new kinit behavior.

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

4 files changed, 19 insertions, 7 deletions

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index ede8998..d82bbe8 100644
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,13 @@
+2000-02-06  Tom Yu  <tlyu@mit.edu>
+
+	* standalone.exp: Use $KLIST -5 and $KDESTROY -5 to deal with
+	changed behavior in these programs.  Wait for eof in some cases to
+	avoid hanging.
+
+	* rsh.exp: Wait for eof to prevent hanging.
+
+	* gssapi.exp: Use $KINIT -5 to deal with new kinit behavior.
+
 Fri Nov  6 10:05:31 1998  Ezra Peisach  <epeisach@mit.edu>
 
 	* gssftp.exp: Changes to deal with new text messages in ftp/ftpd.
diff --git a/src/tests/dejagnu/krb-standalone/gssapi.exp b/src/tests/dejagnu/krb-standalone/gssapi.exp
index 5c229ff..8f932cb 100644
--- a/src/tests/dejagnu/krb-standalone/gssapi.exp
+++ b/src/tests/dejagnu/krb-standalone/gssapi.exp
@@ -36,7 +36,7 @@ proc our_kinit { name pass ccache } {
     global spawn_id
 
     # Use kinit to get a ticket.
-    spawn $KINIT -c $ccache $name@$REALMNAME
+    spawn $KINIT -5 -c $ccache $name@$REALMNAME
     expect {
 	"Password for $name@$REALMNAME:" {
 	    verbose "kinit started"
@@ -56,6 +56,7 @@ proc our_kinit { name pass ccache } {
     expect {
         "\r" { }
     }
+    expect eof
     if ![check_exit_status kinit] {
 	return 0
     }
diff --git a/src/tests/dejagnu/krb-standalone/rsh.exp b/src/tests/dejagnu/krb-standalone/rsh.exp
index 313cdd6..09b5222 100644
--- a/src/tests/dejagnu/krb-standalone/rsh.exp
+++ b/src/tests/dejagnu/krb-standalone/rsh.exp
@@ -108,7 +108,7 @@ proc rsh_test { } {
 	    return
 	}
     }
-
+    expect eof
     if ![check_exit_status $testname] {
 	return
     }
diff --git a/src/tests/dejagnu/krb-standalone/standalone.exp b/src/tests/dejagnu/krb-standalone/standalone.exp
index fba1e14..e925b53 100644
--- a/src/tests/dejagnu/krb-standalone/standalone.exp
+++ b/src/tests/dejagnu/krb-standalone/standalone.exp
@@ -57,9 +57,9 @@ proc doit { } {
     }
 
     # Make sure that klist can see the ticket.
-    spawn $KLIST
+    spawn $KLIST -5
     expect {
-	-re "Ticket cache:\[ 	\]*$tmppwd/tkt.*Default principal:\[ 	\]*krbtest/admin@$REALMNAME.*krbtgt/$REALMNAME@$REALMNAME\r\n" {
+	-re "Ticket cache:\[ 	\]*(.+:)?$tmppwd/tkt.*Default principal:\[ 	\]*krbtest/admin@$REALMNAME.*krbtgt/$REALMNAME@$REALMNAME\r\n" {
 	    verbose "klist started"
 	}
 	timeout {
@@ -72,8 +72,9 @@ proc doit { } {
 	}
     }
 
-   expect {
+    expect {
         "\r" { }
+	eof { }
     }
 
     if ![check_exit_status "klist"] {
@@ -82,14 +83,14 @@ proc doit { } {
     pass "klist"
 
     # Destroy the ticket.
-    spawn $KDESTROY
+    spawn $KDESTROY -5
     if ![check_exit_status "kdestroy"] {
 	return
     }
     pass "kdestroy"
 
     # Double check that the ticket was destroyed.
-    spawn $KLIST
+    spawn $KLIST -5
     expect {
 	-re "klist: No credentials cache file found.*\r\n" {
 	    verbose "klist started"