summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorculler <culler>2020-08-17 15:53:04 (GMT)
committerculler <culler>2020-08-17 15:53:04 (GMT)
commite1968256d828d5f86f7ee09eaea945332df127b1 (patch)
tree570b5bfa72c02f3ba4b32736f98f65128b9a5936 /tests
parent840355939de3409373a08bc3c0c216916d74521f (diff)
downloadtcl-e1968256d828d5f86f7ee09eaea945332df127b1.zip
tcl-e1968256d828d5f86f7ee09eaea945332df127b1.tar.gz
tcl-e1968256d828d5f86f7ee09eaea945332df127b1.tar.bz2
Try to make io-50.6 more robust on the Travis macOS VM
Diffstat (limited to 'tests')
-rw-r--r--tests/io.test11
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/io.test b/tests/io.test
index 685394c..016c6bd 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -6871,7 +6871,7 @@ test io-50.5 {testing handler deletion vs reentrant calls} -constraints {testcha
} -cleanup {
close $f
} -result [list {del calling recursive} {del deleted notcalled} \
- {del deleted myself} {del after recursive}]
+ {del deleted myself} {del after recursive}]
test io-50.6 {testing handler deletion vs reentrant calls} -constraints {testchannelevent testservicemode} -setup {
file delete $path(test1)
} -body {
@@ -6880,6 +6880,7 @@ test io-50.6 {testing handler deletion vs reentrant calls} -constraints {testcha
proc first {f} {
variable u
variable z
+ variable done
if {"$u" == "toplevel"} {
lappend z "first called"
set u first
@@ -6887,6 +6888,7 @@ test io-50.6 {testing handler deletion vs reentrant calls} -constraints {testcha
vwait z
after cancel $timer
lappend z "first after toplevel"
+ set done 1
} else {
lappend z "first called not toplevel"
}
@@ -6908,19 +6910,24 @@ test io-50.6 {testing handler deletion vs reentrant calls} -constraints {testcha
}
set z ""
set u toplevel
+ set done 0
testservicemode 0
set f [open $path(test1) r]
testchannelevent $f add readable [namespace code [list second $f]]
testchannelevent $f add readable [namespace code [list first $f]]
testservicemode 1
update
+ if {!$done} {
+ set $timer2 [after 200 lappend done timeout]
+ vwait done
+ after cancel timer2
+ }
set z
} -cleanup {
close $f
} -result [list {first called} {first called not toplevel} \
{second called, first time} {second called, second time} \
{first after toplevel}]
-
test io-51.1 {Test old socket deletion on Macintosh} {socket} {
set x 0
set result ""