diff options
| author | culler <culler> | 2019-10-10 15:35:53 (GMT) |
|---|---|---|
| committer | culler <culler> | 2019-10-10 15:35:53 (GMT) |
| commit | d77ce0839c97828ce9c6c3dcad68024f272b7a89 (patch) | |
| tree | ca09995d77c0e3fde19a61236bbc208265ac32e6 /tests | |
| parent | 8bffe6f2203ced3faee69ec554f81708ed6c28d6 (diff) | |
| parent | 289b795efe26e23eefb5a04115779c0c78fcb933 (diff) | |
| download | tk-d77ce0839c97828ce9c6c3dcad68024f272b7a89.zip tk-d77ce0839c97828ce9c6c3dcad68024f272b7a89.tar.gz tk-d77ce0839c97828ce9c6c3dcad68024f272b7a89.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/image.test | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/image.test b/tests/image.test index 6d51e51..da65a66 100644 --- a/tests/image.test +++ b/tests/image.test @@ -62,16 +62,16 @@ test image-1.7 {Tk_ImageCmd procedure, "create" option} -constraints { .c create image 100 150 -image myimage update set x {} - set timer [after 500 {lappend x "timeout"}] + set timer [after 500 {lappend x "timed out"}] image create test myimage -variable x update idletasks update # On MacOS we need to wait for the test image display procedure to run. - while {"timeout" ni $x && [lindex $x end 1] ne "display"} { + while {"timed out" ni $x && [lindex $x end 1] ne "display"} { vwait x } after cancel timer - if {[lindex $x end] eq "timeout"} { + if {[lindex $x end] eq "timed out"} { return [lreplace $x end end] } return $x @@ -90,10 +90,10 @@ test image-1.8 {Tk_ImageCmd procedure, "create" option} -constraints { image delete myimage update set x {} + set timer [after 500 {lappend x "timed out"}] image create test myimage -variable x - # macOS Catalina needs a delay here. - after 20 - update + vwait x + after cancel $timer return $x } -cleanup { .c delete all @@ -372,15 +372,15 @@ test image-9.1 {Tk_ImageChanged procedure} -constraints testImageType -setup { .c create image 50 50 -image foo update set x {} - set timer [after 500 {lappend x "timeout"}] + set timer [after 500 {lappend x "timed out"}] foo changed 5 6 7 8 30 15 update idletasks update # On MacOS we need to wait for the test image display procedure to run. - while {"timeout" ni $x && [lindex $x end 1] ne "display"} { + while {"timed out" ni $x && [lindex $x end 1] ne "display"} { vwait x } - after cancel timer + after cancel $timer return $x } -cleanup { .c delete all @@ -403,10 +403,10 @@ test image-9.2 {Tk_ImageChanged procedure} -constraints testImageType -setup { update set x {} foo changed 5 6 7 8 30 15 + set timer [after 500 {lappend x "timed out"}] image create test myimage -variable x - # macOS Catalina needs a delay here. - after 20 - update + vwait x + after cancel $timer return $x } -cleanup { .c delete all @@ -445,10 +445,10 @@ test image-11.1 {Tk_FreeImage procedure} -constraints testImageType -setup { update set x {} .c delete i1 + set timer [after 500 {lappend x "timed out"}] pack .c - update - # macOS Catalina needs a delay here. - after 20 + vwait x + after cancel $timer list [imageNames] $x } -cleanup { .c delete all |