summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarc_culler <marc.culler@gmail.com>2020-07-12 22:20:04 (GMT)
committermarc_culler <marc.culler@gmail.com>2020-07-12 22:20:04 (GMT)
commit5e62075ec23dc8688b0880787a8509deb0b3d7b1 (patch)
tree4232f10045b56fda23cf0a784040f30e4792917f
parentaf7543d7737a8987f2a209471913e6bbf4106b78 (diff)
downloadtk-5e62075ec23dc8688b0880787a8509deb0b3d7b1.zip
tk-5e62075ec23dc8688b0880787a8509deb0b3d7b1.tar.gz
tk-5e62075ec23dc8688b0880787a8509deb0b3d7b1.tar.bz2
Tweak and untweak a couple of tests with race conditions.
-rw-r--r--tests/textDisp.test2
-rw-r--r--tests/textWind.test6
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/textDisp.test b/tests/textDisp.test
index b4891e4..a017dad 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -4198,7 +4198,7 @@ test textDisp-33.2 {one line longer than fits in the widget} {
.tt debug 1
set tk_textHeightCalc ""
.tt insert 1.0 [string repeat "more wrap + " 1]
- after 100 ; update idletasks
+ update idletasks
# Nothing should have been recalculated.
set tk_textHeightCalc
} {}
diff --git a/tests/textWind.test b/tests/textWind.test
index 938357b..f2daaca 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -751,15 +751,17 @@ test textWind-10.5 {EmbWinLayoutProc procedure, error in creating window} -setup
destroy .t.f
proc bgerror args {
global msg
- lappend msg $args
+ if {$msg == ""} {
+ lappend msg $args
+ }
}
} -body {
.t insert 1.0 "Some sample text"
+ set msg {}
.t window create 1.5 -create {
frame .t.f
frame .t.f.f -width 10 -height 20 -bg $color
}
- set msg {}
update idletasks
lappend msg [winfo exists .t.f.f]
} -cleanup {