summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-05-26 10:58:14 (GMT)
committernijtmans <nijtmans>2010-05-26 10:58:14 (GMT)
commitd59e4da7e1c57fe1962f24cafedbc04cf2cc5b2b (patch)
treeb9157376b884ecc487c2dfbdc2eb9d31a4ded0d4
parent16e2616552f5fc57dd669f4875e476fd9656e498 (diff)
downloadtk-d59e4da7e1c57fe1962f24cafedbc04cf2cc5b2b.zip
tk-d59e4da7e1c57fe1962f24cafedbc04cf2cc5b2b.tar.gz
tk-d59e4da7e1c57fe1962f24cafedbc04cf2cc5b2b.tar.bz2
Fix 3 tests on Ubuntu 10.4, two of them timing dependent, one wm-dependent.
-rw-r--r--ChangeLog5
-rw-r--r--tests/wm.test16
2 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index c39b897..e6eb52c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-26 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * tests/wm.test: Fix 3 tests on Ubuntu 10.4, two of them timing dependent,
+ one wm-dependent.
+
2010-05-20 Donal K. Fellows <dkf@users.sf.net>
* win/tkWinX.c (HandleIMEComposition): [Bug 2992129]: Ensure that all
diff --git a/tests/wm.test b/tests/wm.test
index 0aa229a..b3e4cb6 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.48 2010/01/19 01:27:41 patthoyts Exp $
+# RCS: @(#) $Id: wm.test,v 1.49 2010/05/26 10:58:14 nijtmans Exp $
# This file tests window manager interactions that work across platforms.
# Window manager tests that only work on a specific platform should be placed
@@ -643,16 +643,16 @@ test wm-geometry-1.3 {usage} -returnCodes error -body {
wm geometry . bogus
} -result {bad geometry specifier "bogus"}
-test wm-geometry-2.1 {setting values} -setup {
- set result {}
-} -body {
+test wm-geometry-2.1 {setting values} -body {
wm geometry .t 150x150+50+50
update
- lappend result [wm geometry .t]
+ set result [wm geometry .t]
wm geometry .t {}
update
- lappend result [string equal [wm geometry .t] "150x150+50+50"]
-} -result [list 150x150+50+50 0]
+ return [list $result [string equal [wm geometry .t] $result]]
+} -cleanup {
+ unset result
+} -match glob -result [list 150x150+*+* 0]
### wm grid ###
@@ -1356,6 +1356,7 @@ test wm-stackorder-2.3 {stacking order} -body {
toplevel .t ; update
toplevel .t2 ; update
raise .
+ raiseDelay
raise .t2
raiseDelay
wm stackorder .
@@ -1706,6 +1707,7 @@ test wm-transient-4.1 {transient toplevel is withdrawn
test wm-transient-4.2 {already mapped transient toplevel
is withdrawn if master is iconic} -body {
toplevel .master
+ raiseDelay
wm iconify .master
update
toplevel .subject