summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-10-13 18:15:56 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-10-13 18:15:56 (GMT)
commitc6300a7265e457702bf13456bfdccd02aa4a1a54 (patch)
tree633af8c60b7edde7f150480213f2abdc2f49a66f /tests
parent3f2bd047306169e148056331830dfb214349fb71 (diff)
parenta37288e3386c67b1c08f3fee24fcdfb265b90930 (diff)
downloadtk-c6300a7265e457702bf13456bfdccd02aa4a1a54.zip
tk-c6300a7265e457702bf13456bfdccd02aa4a1a54.tar.gz
tk-c6300a7265e457702bf13456bfdccd02aa4a1a54.tar.bz2
merge trunk
Diffstat (limited to 'tests')
-rw-r--r--tests/winWm.test23
1 files changed, 13 insertions, 10 deletions
diff --git a/tests/winWm.test b/tests/winWm.test
index a4d2669..ad4988d 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -541,25 +541,28 @@ test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -setup
} -body {
pack .t.f.x
pack .t.f
- set aid [after 1000 {set ::winwm92 timeout}]
- after 100 {
+ lappend aid [after 2000 {set ::winwm92 timeout}] [after 100 {
wm manage .t.f
wm iconify .t
- after 100 {
+ lappend aid [after 100 {
wm forget .t.f
wm deiconify .t
- after 100 {
+ lappend aid [after 100 {
pack .t.f
- after 100 {set ::winwm92 [expr {[winfo rooty .t.f.x] == 0 ? "failed" : "ok"}]}
- }
- }
- }
+ lappend aid [after 100 {
+ set ::winwm92 [expr {
+ [winfo rooty .t.f.x] == 0 ? "failed" : "ok"}]}]
+ }]
+ }]
+ }]
vwait ::winwm92
- after cancel $aid
+ foreach id $aid {
+ after cancel $id
+ }
set winwm92
} -cleanup {
destroy .t.f.x .t.f .t
- unset -nocomplain winwm92 aid
+ unset -nocomplain winwm92 aid id
} -result ok
destroy .t