From: Ezra Peisach <epeisach@mit.edu>
Date: Wed, 10 May 1995 20:57:33 +0000 (+0000)
Subject: Modifications to klist to prevent an expect bug for hanging tests.
X-Git-Tag: krb5-1.0-beta6~2004
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=647f506e4eb5c78d53d750bae71e6f515286ff66;p=krb5.git

Modifications to klist to prevent an expect bug for hanging tests.
(sync. problem with spawned process exiting too quickly).

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

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index e1e24900b..da1934e69 100644
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,8 @@
+Sat May  6 17:12:37 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* standalone.exp: klist test - added new line to prevent an OSF/1
+	        expect bug which would hang the klist process in waiting.
+
 Fri May  5 12:49:19 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* rcp.exp: (rcp_test()): Encrypted rcp are no longer expected to
diff --git a/src/tests/dejagnu/krb-standalone/standalone.exp b/src/tests/dejagnu/krb-standalone/standalone.exp
index e6a942428..5cde955cb 100644
--- a/src/tests/dejagnu/krb-standalone/standalone.exp
+++ b/src/tests/dejagnu/krb-standalone/standalone.exp
@@ -58,7 +58,7 @@ proc doit { } {
     # Make sure that klist can see the ticket.
     spawn $KLIST
     expect {
-	-re "Ticket cache:\[ 	\]*$tmppwd/tkt.*Default principal:\[ 	\]*krbtest/admin@KRBTEST.COM.*krbtgt/KRBTEST.COM@KRBTEST.COM" {
+	-re "Ticket cache:\[ 	\]*$tmppwd/tkt.*Default principal:\[ 	\]*krbtest/admin@KRBTEST.COM.*krbtgt/KRBTEST.COM@KRBTEST.COM\r\n" {
 	    verbose "klist started"
 	}
 	timeout {
@@ -70,6 +70,11 @@ proc doit { } {
 	    return
 	}
     }
+
+   expect {
+        "\r" { }
+    }
+
     if ![check_exit_status "klist"] {
 	return
     }
@@ -85,7 +90,7 @@ proc doit { } {
     # Double check that the ticket was destroyed.
     spawn $KLIST
     expect {
-	-re "klist: No credentials cache file found.*\r" {
+	-re "klist: No credentials cache file found.*\r\n" {
 	    verbose "klist started"
 	}
 	timeout {