summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2002-02-27 20:55:55 (GMT)
committerandreas_kupries <akupries@shaw.ca>2002-02-27 20:55:55 (GMT)
commit7dad982387340c5d18dd4477e41321739e4b4c42 (patch)
treed439c5a5a6b00de1ac59ed51c022ed7ff980effd
parente614e9de5c5d3ddc9b8646a48c60a009f874014a (diff)
downloadtcl-7dad982387340c5d18dd4477e41321739e4b4c42.zip
tcl-7dad982387340c5d18dd4477e41321739e4b4c42.tar.gz
tcl-7dad982387340c5d18dd4477e41321739e4b4c42.tar.bz2
* tests/socket.test (2.7): Accepted and applied patch for Tcl SF
bug #523470 provided by Don Porter <dgp@users.sourceforge.net> to avoid timing problems in that test.
-rw-r--r--ChangeLog4
-rw-r--r--tests/socket.test6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e44525..3a6648d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2002-02-27 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+ * tests/socket.test (2.7): Accepted and applied patch for Tcl SF
+ bug #523470 provided by Don Porter <dgp@users.sourceforge.net>
+ to avoid timing problems in that test.
+
* unix/tclUnixChan.c (TclpOpenFileChannel): Added code to regonize
"/dev/tty" (by name) and to not handle it as tty / serial
line. This is the controlling terminal and is special. Setting
diff --git a/tests/socket.test b/tests/socket.test
index cca7abb..6952ba9 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.21 2002/01/25 23:06:58 mdejong Exp $
+# RCS: @(#) $Id: socket.test,v 1.22 2002/02/27 20:55:55 andreas_kupries Exp $
# Running socket tests with a remote server:
# ------------------------------------------
@@ -433,7 +433,7 @@ test socket-2.7 {echo server, one line} {socket stdio} {
removeFile script
set f [open script w]
puts $f {
- set timer [after 2000 "set x done"]
+ set timer [after 10000 "set x timeout"]
set f [socket -server accept 0]
proc accept {s a p} {
fileevent $s readable [list echo $s]
@@ -454,7 +454,7 @@ test socket-2.7 {echo server, one line} {socket stdio} {
vwait x
after cancel $timer
close $f
- puts done
+ puts $x
}
close $f
set f [open "|[list $::tcltest::tcltest script]" r]