summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--tests/socket.test5
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e2a19e0..71afc2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2010-06-25 Reinhard Max <max@suse.de>
+
+ * tests/socket.test: Prevent a race condition during shutdown of
+ the remote test server that can cause a hang when the server is
+ being run in verbose mode.
+
2010-06-24 Jan Nijtmans <nijtmans@users.sf.net>
- * win/tclWinPort.h [Bug 3019634] errno.h and tclWinPort.h have
+ * win/tclWinPort.h [Bug 3019634] errno.h and tclWinPort.h have
conflicting definitions.
***POTENTIAL INCOMPATIBILITY***
diff --git a/tests/socket.test b/tests/socket.test
index abfe169..99ce29f 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.42 2008/09/02 15:49:25 dkf Exp $
+# RCS: @(#) $Id: socket.test,v 1.43 2010/06/25 15:20:06 rmax Exp $
# Running socket tests with a remote server:
# ------------------------------------------
@@ -1651,8 +1651,7 @@ removeFile script2
# cleanup
if {[string match sock* $commandSocket] == 1} {
- puts $commandSocket exit
- flush $commandSocket
+ catch {sendCommand exit}
}
catch {close $commandSocket}
catch {close $remoteProcChan}