Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3.8] bpo-42142: Try to fix timeouts in ttk tests (GH-23474) #23566

Merged
merged 1 commit into from Nov 30, 2020
Merged

[3.8] bpo-42142: Try to fix timeouts in ttk tests (GH-23474) #23566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions Lib/tkinter/test/test_ttk/test_extensions.py
View file
Open in desktop
Expand Up @@ -114,7 +114,6 @@ def check_positions(scale, scale_pos, label, label_pos):
def test_horizontal_range(self):
lscale = ttk.LabeledScale(self.root, from_=0, to=10)
lscale.pack()
lscale.wait_visibility()
lscale.update()

linfo_1 = lscale.label.place_info()
Expand Down Expand Up @@ -144,7 +143,6 @@ def test_horizontal_range(self):
def test_variable_change(self):
x = ttk.LabeledScale(self.root)
x.pack()
x.wait_visibility()
x.update()

curr_xcoord = x.scale.coords()[0]
Expand Down Expand Up @@ -187,7 +185,6 @@ def test_variable_change(self):
def test_resize(self):
x = ttk.LabeledScale(self.root)
x.pack(expand=True, fill='both')
x.wait_visibility()
x.update()

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

# check that variable is updated correctly
optmenu.pack()
optmenu.wait_visibility()
optmenu['menu'].invoke(0)
self.assertEqual(optmenu._variable.get(), items[0])

Expand Down Expand Up @@ -299,9 +295,7 @@ def test_unique_radiobuttons(self):
textvar2 = tkinter.StringVar(self.root)
optmenu2 = ttk.OptionMenu(self.root, textvar2, default, *items)
optmenu.pack()
optmenu.wait_visibility()
optmenu2.pack()
optmenu2.wait_visibility()
optmenu['menu'].invoke(1)
optmenu2['menu'].invoke(2)
optmenu_stringvar_name = optmenu['menu'].entrycget(0, 'variable')
Expand Down
20 changes: 7 additions & 13 deletions Lib/tkinter/test/test_ttk/test_widgets.py
View file
Open in desktop
Expand Up @@ -60,11 +60,10 @@ def setUp(self):
super().setUp()
self.widget = ttk.Button(self.root, width=0, text="Text")
self.widget.pack()
self.widget.wait_visibility()


def test_identify(self):
self.widget.update_idletasks()
self.widget.update()
self.assertEqual(self.widget.identify(
int(self.widget.winfo_width() / 2),
int(self.widget.winfo_height() / 2)
Expand Down Expand Up @@ -326,8 +325,7 @@ def test_bbox(self):

def test_identify(self):
self.entry.pack()
self.entry.wait_visibility()
self.entry.update_idletasks()
self.entry.update()

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

height = self.combo.winfo_height()
self._show_drop_down_listbox()
Expand All @@ -466,7 +464,7 @@ def test_postcommand(self):

self.combo['postcommand'] = lambda: success.append(True)
self.combo.pack()
self.combo.wait_visibility()
self.combo.update()

self._show_drop_down_listbox()
self.assertTrue(success)
Expand Down Expand Up @@ -666,7 +664,6 @@ def test_sashpos(self):
self.assertRaises(tkinter.TclError, self.paned.sashpos, 1)

self.paned.pack(expand=True, fill='both')
self.paned.wait_visibility()

curr_pos = self.paned.sashpos(0)
self.paned.sashpos(0, 1000)
Expand Down Expand Up @@ -934,7 +931,7 @@ def test_tab_identifiers(self):
self.nb.add(self.child1, text='a')

self.nb.pack()
self.nb.wait_visibility()
self.nb.update()
if sys.platform == 'darwin':
tb_idx = "@20,5"
else:
Expand Down Expand Up @@ -1042,7 +1039,7 @@ def test_insert(self):

def test_select(self):
self.nb.pack()
self.nb.wait_visibility()
self.nb.update()

success = []
tab_changed = []
Expand Down Expand Up @@ -1085,7 +1082,7 @@ def test_tabs(self):

def test_traversal(self):
self.nb.pack()
self.nb.wait_visibility()
self.nb.update()

self.nb.select(0)

Expand Down Expand Up @@ -1347,7 +1344,6 @@ def test_show(self):
def test_bbox(self):
self.tv.pack()
self.assertEqual(self.tv.bbox(''), '')
self.tv.wait_visibility()
self.tv.update()

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

self.tv.pack()
self.tv.wait_visibility()
self.tv.heading('#0', command=lambda: success.append(True))
self.tv.column('#0', width=100)
self.tv.update()
Expand Down Expand Up @@ -1792,7 +1787,6 @@ def test_tag_bind(self):
lambda evt: events.append(2))

self.tv.pack()
self.tv.wait_visibility()
self.tv.update()

pos_y = set()
Expand Down