summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--tests/socket.test16
2 files changed, 11 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index c3efeb3..c2db924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,6 @@
TCL_CONTINUE returns from procs. Patch by Don Porter
[Bug 536955].
-2002-04-15 Miguel Sofer <msofer@users.sourceforge.net>
-
* generic/tclExecute.c:
* tests/compile.test: made bytecodes check for a catch before
returning; the compiled [return] is otherwise non-catchable.
@@ -14,6 +12,9 @@
2002-04-15 Don Porter <dgp@users.sourceforge.net>
+ * tests/socket.test: Increased timeout values so that tests have
+ time to successfully complete even on slow/busy machines. [Bug 523470]
+
* doc/tcltest.n:
* library/tcltest/tcltest.tcl:
* tests/tcltest.test: Revised [tcltest::test] to return errors
diff --git a/tests/socket.test b/tests/socket.test
index 6952ba9..f5c75b1 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.22 2002/02/27 20:55:55 andreas_kupries Exp $
+# RCS: @(#) $Id: socket.test,v 1.23 2002/04/15 23:09:12 dgp Exp $
# Running socket tests with a remote server:
# ------------------------------------------
@@ -252,7 +252,7 @@ test socket-2.1 {tcp connection} {socket stdio} {
removeFile script
set f [open script w]
puts $f {
- set timer [after 2000 "set x timed_out"]
+ set timer [after 10000 "set x timed_out"]
set f [socket -server accept 0]
proc accept {file addr port} {
global x
@@ -290,7 +290,7 @@ test socket-2.2 {tcp connection with client port specified} {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 {file addr port} {
global x
@@ -390,7 +390,7 @@ test socket-2.5 {tcp connection with redundant server port} {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 {file addr port} {
global x
@@ -1450,12 +1450,12 @@ test socket-12.2 {testing inheritance of client sockets} {socket exec} {
removeFile script1
removeFile script2
- # Script1 is just a 10 second delay. If the server socket
+ # Script1 is just a 20 second delay. If the server socket
# is inherited, it will be held open for 10 seconds
set f [open script1 w]
puts $f {
- after 10000 exit
+ after 20000 exit
vwait forever
}
close $f
@@ -1512,11 +1512,11 @@ test socket-12.2 {testing inheritance of client sockets} {socket exec} {
return
}
- # If the socket doesn't hit end-of-file in 5 seconds, the
+ # If the socket doesn't hit end-of-file in 10 seconds, the
# script1 process must have inherited the client.
set failed 0
- after 5000 [list set failed 1]
+ after 10000 [list set failed 1]
# Launch the script2 process
### exec $::tcltest::tcltest script2 &