diff options
| author | Tom Yu <tlyu@mit.edu> | 2009-01-28 00:32:29 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2009-01-28 00:32:29 +0000 |
| commit | 13875f3bda06ded148da2fae89020d6b5de1813a (patch) | |
| tree | 66c757cd36fee187a79d2488b9ad5fe922a7f1b3 /src/lib/rpc | |
| parent | 03210b333367d8158ca4a26ebe5d94f0927c19a5 (diff) | |
| download | krb5-13875f3bda06ded148da2fae89020d6b5de1813a.zip krb5-13875f3bda06ded148da2fae89020d6b5de1813a.tar.gz krb5-13875f3bda06ded148da2fae89020d6b5de1813a.tar.bz2 | |
Run a single expect statement to read from both client and server, to
avoid an apparent race condition on Darwin.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21814 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/rpc')
| -rw-r--r-- | src/lib/rpc/unit-test/rpc_test.0/fullrun.exp | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp b/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp index 7cdda8a..2b2d205 100644 --- a/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp +++ b/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp @@ -19,22 +19,16 @@ set ver_line "rpc_test server: bad verifier\[^\r\n\]*\[\r\n]+" set dots 0 set server_lines 0 while {1} { - set oldtimeout $timeout - set timeout 5 - while {1} { - expect { - -i $server_id - -re $ver_line { - verbose "Got line from server." - incr server_lines - } - default { - break - } - } - } - set timeout $oldtimeout expect { + -i $server_id + -re $ver_line { + verbose "Got line from server." + incr server_lines + } + default { + exp_continue + } + -i $client_id . { incr dots @@ -54,7 +48,6 @@ while {1} { fail "full run: timeout waiting for dot" break } - } } if {$dots==11} { |