svn rev #21814: trunk/src/lib/rpc/unit-test/rpc_test.0/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21814
Commit By: tlyu
Log Message:
Run a single expect statement to read from both client and server, to
avoid an apparent race condition on Darwin.


Changed Files:
U   trunk/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp
Modified: trunk/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp
===================================================================
--- trunk/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp	2009-01-28 00:30:06 UTC (rev 21813)
+++ trunk/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp	2009-01-28 00:32:29 UTC (rev 21814)
@@ -19,22 +19,16 @@
 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 @@
 			fail "full run: timeout waiting for dot"
 			break
 		}
-
 	}
 }
 if {$dots==11} {