Fix issues with mapping and unmapping windows revealed by tests on Yosemite.

1 files changed, 11 insertions, 8 deletions

diff --git a/tests/pack.test b/tests/pack.test
index b1c22c7..04e84b9 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -1554,6 +1554,7 @@ test pack-18.1 {unmap slaves when master unmapped} -constraints {
     tempNotPc
 } -setup {
     eval destroy [winfo child .pack]
+    update idletasks
 } -body {
 
     # adjust the position of .pack before test to avoid a screen switch
@@ -1561,25 +1562,27 @@ test pack-18.1 {unmap slaves when master unmapped} -constraints {
     # as the screen (screen switch causes scale and other tests to fail).
 
     wm geometry .pack +100+100
+    update idletasks
 
     # On the PC, when the width/height is configured while the window is
     # unmapped, the changes don't take effect until the window is remapped.
     # Who knows why?
 
     eval destroy [winfo child .pack]
+    update idletasks
     frame .pack.a -width 100 -height 50 -relief raised -bd 2
     pack .pack.a
-    update
+    update idletasks
     set result [winfo ismapped .pack.a]
     wm iconify .pack
-    update
+    update idletasks
     lappend result [winfo ismapped .pack.a]
     .pack.a configure -width 200 -height 75
-    update
+    update idletasks
     lappend result [winfo width .pack.a ] [winfo height .pack.a] \
     [winfo ismapped .pack.a]
     wm deiconify .pack
-    update
+    update idletasks
     lappend result [winfo ismapped .pack.a]
 } -result {1 0 200 75 0 1}
 test pack-18.2 {unmap slaves when master unmapped} -setup {
@@ -1595,17 +1598,17 @@ test pack-18.2 {unmap slaves when master unmapped} -setup {
     frame .pack.b -width 70 -height 30 -relief sunken -bd 2
     pack .pack.a
     pack .pack.b -in .pack.a
-    update
+    update idletasks
     set result [winfo ismapped .pack.b]
     wm iconify .pack
-    update
+    update idletasks
     lappend result [winfo ismapped .pack.b]
     .pack.b configure -width 100 -height 30
-    update
+    update idletasks
     lappend result [winfo width .pack.b ] [winfo height .pack.b] \
     [winfo ismapped .pack.b]
     wm deiconify .pack
-    update
+    update idletasks
     lappend result [winfo ismapped .pack.b]
 } -result {1 0 100 30 0 1}