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 e1e24900b8f1b9e8de98626d874554a39ac3e272..da1934e690b4a44112798403339c904b0f59c2e5 100644 (file)
--- 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 e6a942428688626d093927e0440dbbb4d75da4ec..5cde955cbab75561727954ae81c7de7f78d9efc2 100644 (file)
--- 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 {