* tests/winfo.test: Wait until child window is visible

	* tests/wm.test:    Modified test to match actual error output.

2 files changed, 6 insertions, 5 deletions

diff --git a/tests/winfo.test b/tests/winfo.test
index 3f9a1c1..5fba94c 100644
--- a/tests/winfo.test
+++ b/tests/winfo.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winfo.test,v 1.9 2002/07/13 21:52:34 dgp Exp $
+# RCS: @(#) $Id: winfo.test,v 1.9.2.1 2005/10/10 15:19:41 patthoyts Exp $
 
 package require tcltest 2.1
 namespace import -force tcltest::configure
@@ -115,7 +115,8 @@ toplevel .t -width 550 -height 400
 frame .t.f -width 80 -height 60 -bd 2 -relief raised
 place .t.f -x 50 -y 50
 wm geom .t +0+0
-update
+tkwait visibility .t.f
+
 test winfo-4.1 {"winfo containing" command} {
     list [catch {winfo containing 22} msg] $msg
 } {1 {wrong # args: should be "winfo containing ?-displayof window? rootX rootY"}}
diff --git a/tests/wm.test b/tests/wm.test
index 60462e8..7313891 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: wm.test,v 1.21.2.4 2005/01/14 21:09:48 jenglish Exp $
+# RCS: @(#) $Id: wm.test,v 1.21.2.5 2005/10/10 15:19:41 patthoyts Exp $
 
 # This file tests window manager interactions that work across
 # platforms. Window manager tests that only work on a specific
@@ -404,11 +404,11 @@ test wm-grid-1.10 {usage} {
 
 test wm-grid-1.11 {usage} {
     list [catch {wm grid . 13 14 -1 16} msg] $msg
-} {1 {widthInc can't be <= 0}}
+} {1 {widthInc can't be < 0}}
 
 test wm-grid-1.12 {usage} {
     list [catch {wm grid . 13 14 15 -1} msg] $msg
-} {1 {heightInc can't be <= 0}}
+} {1 {heightInc can't be < 0}}
 
 test wm-grid-2.1 {setting and reading values} {
     set result {}