8000 bpo-42142: Try to fix timeouts in ttk tests (GH-23474) · python/cpython@a5b0c17 · GitHub
[go: up one dir, main page]
Skip to content

Commit a5b0c17

Browse files
miss-islingtonserhiy-storchaka
miss-islington
and
serhiy-storchaka
authored
bpo-42142: Try to fix timeouts in ttk tests (GH-23474)
Instead of using wait_visibility() which waits event <VisibilityNotify> in dead loop use update() which should proceed all queued events. (cherry picked from commit 6cc2c41) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
1 parent d82e08d commit a5b0c17

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

‎Lib/tkinter/test/test_ttk/test_extensions.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ def check_positions(scale, scale_pos, label, label_pos):
114114
def test_horizontal_range(self):
115115
lscale = ttk.LabeledScale(self.root, from_=0, to=10)
116116
lscale.pack()
117-
lscale.wait_visibility()
118117
lscale.update()
119118

120119
linfo_1 = lscale.label.place_info()
@@ -144,7 +143,6 @@ def test_horizontal_range(self):
144143
def test_variable_change(self):
145144
x = ttk.LabeledScale(self.root)
146145
x.pack()
147-
x.wait_visibility()
148146
x.update()
149147

150148
curr_xcoord = x.scale.coords()[0]
@@ -187,7 +185,6 @@ def test_variable_change(self):
187185
def test_resize(self):
188186
x = ttk.LabeledScale(self.root)
189187
x.pack(expand=True, fill='both')
190-
x.wait_visibility()
191188
x.update()
192189

193190
width, height = x.master.winfo_width(), x.master.winfo_height()
@@ -268,7 +265,6 @@ def test_menu(self):
268265

269266
# check that variable is updated correctly
270267
optmenu.pack()
271-
optmenu.wait_visibility()
272268
optmenu['menu'].invoke(0)
273269
self.assertEqual(optmenu._variable.get(), items[0])
274270

@@ -299,9 +295,7 @@ def test_unique_radiobuttons(self):
299295
textvar2 = tkinter.StringVar(self.root)
300296
optmenu2 = ttk.OptionMenu(self.root, textvar2, default, *items)
301297
optmenu.pack()
302-
optmenu.wait_visibility()
303298
optmenu2.pack()
304-
optmenu2.wait_visibility()
305299
optmenu['menu'].invoke(1)
306300
optmenu2['menu'].invoke(2)
307301
optmenu_stringvar_name = optmenu['menu'].entrycget(0, 'variable')

‎Lib/tkinter/test/test_ttk/test_widgets.py

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,10 @@ def setUp(self):
6060
super().setUp()
6161
self.widget = ttk.Button(self.root, width=0, text="Text")
6262
self.widget.pack()
63-
self.widget.wait_visibility()
6463

6564

6665
def test_identify(self):
67-
self.widget.update_idletasks()
66+
self.widget.update()
6867
self.assertEqual(self.widget.identify(
6968
int(self.widget.winfo_width() / 2),
7069
int(self.widget.winfo_height() < 10000 span class=pl-c1>/ 2)
@@ -326,8 +325,7 @@ def test_bbox(self):
326325

327326
def test_identify(self):
328327
self.entry.pack()
329-
self.entry.wait_visibility()
330-
self.entry.update_idletasks()
328+
self.entry.update()
331329

332330
# bpo-27313: macOS Cocoa widget differs from X, allow either
333331
if sys.platform == 'darwin':
@@ -450,7 +448,7 @@ def test_virtual_event(self):
450448
self.combo.bind('<<ComboboxSelected>>',
451449
lambda evt: success.append(True))
452450
self.combo.pack()
453-
self.combo.wait_visibility()
451+
self.combo.update()
454452

455453
height = self.combo.winfo_height()
456454
self._show_drop_down_listbox()
@@ -466,7 +464,7 @@ def test_postcommand(self):
466464

467465
self.combo['postcommand'] = lambda: success.append(True)
468466
self.combo.pack()
469-
self.combo.wait_visibility()
467+
self.combo.update()
470468

471469
self._show_drop_down_listbox()
472470
self.assertTrue(success)
@@ -666,7 +664,6 @@ def test_sashpos(self):
666664
self.assertRaises(tkinter.TclError, self.paned.sashpos, 1)
667665

668666
self.paned.pack(expand=True, fill='both')
669-
self.paned.wait_visibility()
670667

671668
curr_pos = self.paned.sashpos(0)
672669
self.paned.sashpos(0, 1000)
@@ -934,7 +931,7 @@ def test_tab_identifiers(self):
934931
self.nb.add(self.child1, text='a')
935932

936933
self.nb.pack()
937-
self.nb.wait_visibility()
934+
self.nb.update()
938935
if sys.platform == 'darwin':
939936
tb_idx = "@20,5"
940937
else:
@@ -1042,7 +1039,7 @@ def test_insert(self):
10421039

10431040
def test_select(self):
10441041
self.nb.pack()
1045-
self.nb.wait_visibility()
1042+
self.nb.update()
10461043

10471044
success = []
10481045
tab_changed = []
@@ -1085,7 +1082,7 @@ def test_tabs(self):
10851082

10861083
def test_traversal(self):
10871084
self.nb.pack()
1088-
self.nb.wait_visibility()
1085+
self.nb.update()
10891086

10901087
self.nb.select(0)
10911088

@@ -1347,7 +1344,6 @@ def test_show(self):
13471344
def test_bbox(self):
13481345
self.tv.pack()
13491346
self.assertEqual(self.tv.bbox(''), '')
1350-
self.tv.wait_visibility()
13511347
self.tv.update()
13521348

13531349
item_id = self.tv.insert('', 'end')
@@ -1544,7 +1540,6 @@ def simulate_heading_click(x, y):
15441540
success = [] # no success for now
15451541

15461542
self.tv.pack()
1547-
self.tv.wait_visibility()
15481543
self.tv.heading('#0', command=lambda: success.append(True))
15491544
self.tv.column('#0', width=100)
15501545
self.tv.update()
@@ -1792,7 +1787,6 @@ def test_tag_bind(self):
17921787
lambda evt: events.append(2))
17931788

17941789
self.tv.pack()
1795-
self.tv.wait_visibility()
17961790
self.tv.update()
17971791

17981792
pos_y = set()

0 commit comments

Comments
0 (0)
0