some more speedups to socket.test

FossilOrigin-Name: f37b754d86426a7a47ba0f62adbb10a45d433136

2 files changed, 7 insertions, 6 deletions

diff --git a/tests/remote.tcl b/tests/remote.tcl
index fd50b51..06000aa 100644
--- a/tests/remote.tcl
+++ b/tests/remote.tcl
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: remote.tcl,v 1.4 2010/09/28 15:13:55 rmax Exp $
+# RCS: @(#) $Id: remote.tcl,v 1.5 2010/11/04 21:38:27 rmax Exp $
 
 # Initialize message delimitor
 
@@ -156,5 +156,6 @@ if {[catch {set serverSocket \
 	[socket -myaddr $serverAddress -server __accept__ $serverPort]} msg]} {
     puts "Server on $serverAddress:$serverPort cannot start: $msg"
 } else {
+    puts ready
     vwait __server_wait_variable__
 }
diff --git a/tests/socket.test b/tests/socket.test
index 7827ce6..1cc4441 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: socket.test,v 1.48 2010/11/04 21:08:19 rmax Exp $
+# RCS: @(#) $Id: socket.test,v 1.49 2010/11/04 21:38:27 rmax Exp $
 
 # Running socket tests with a remote server:
 # ------------------------------------------
@@ -151,7 +151,7 @@ if {$doTestsWithRemoteServer} {
 		    [interpreter] $remoteFile -serverIsSilent \
 		    -port $remoteServerPort -address $remoteServerIP]" w+]
 	} msg]} then {
-	    after 1000
+	    gets $remoteProcChan
 	    if {[catch {
 		set commandSocket [socket $remoteServerIP $remoteServerPort]
 	    } msg] == 0} then {
@@ -1309,7 +1309,7 @@ test socket_$af-11.11 {testing spurious events} -setup {
 	set server [socket -server accept 0]
 	proc accept {s a p} {
 	    fconfigure $s -translation "auto lf"
-	    after 100 writesome $s
+	    after idle writesome $s
 	}
 	proc writesome {s} {
 	    for {set i 0} {$i < 100} {incr i} {
@@ -1352,7 +1352,7 @@ test socket_$af-11.12 {testing EOF stickyness} -constraints [list socket support
     set port [sendCommand {
 	set server [socket -server accept 0]
 	proc accept {s a p} {
-	    after 100 close $s
+	    after idle close $s
 	}
 	getPort $server
     }]
@@ -1681,9 +1681,9 @@ if {$remoteProcChan ne ""} {
 }
 catch {close $commandSocket}
 catch {close $remoteProcChan}
+}
 ::tcltest::cleanupTests
 flush stdout
-}
 return
 
 # Local Variables: