mirror of
https://github.com/python/cpython.git
synced 2025-12-08 06:10:17 +00:00
Issue #22236: Tkinter tests now don't reuse default root window. New root
window is created for every test class. Fixed Tkinter images copying operations in NoDefaultRoot mode. Tcl command names generated for "after" callbacks now contains a name of original function.
This commit is contained in:
parent
ee55826072
commit
d00aff2f62
15 changed files with 231 additions and 271 deletions
|
|
@ -278,7 +278,7 @@ class PlaceTest(AbstractWidgetTest, unittest.TestCase):
|
|||
|
||||
def create2(self):
|
||||
t = tkinter.Toplevel(self.root, width=300, height=200, bd=0)
|
||||
t.wm_geometry('+0+0')
|
||||
t.wm_geometry('300x200+0+0')
|
||||
f = tkinter.Frame(t, width=154, height=84, bd=2, relief='raised')
|
||||
f.place_configure(x=48, y=38)
|
||||
f2 = tkinter.Frame(t, width=30, height=60, bd=2, relief='raised')
|
||||
|
|
@ -479,7 +479,6 @@ def test_place_slaves(self):
|
|||
class GridTest(AbstractWidgetTest, unittest.TestCase):
|
||||
|
||||
def tearDown(self):
|
||||
super().tearDown()
|
||||
cols, rows = self.root.grid_size()
|
||||
for i in range(cols + 1):
|
||||
self.root.grid_columnconfigure(i, weight=0, minsize=0, pad=0, uniform='')
|
||||
|
|
@ -488,10 +487,10 @@ def tearDown(self):
|
|||
self.root.grid_propagate(1)
|
||||
if tcl_version >= (8, 5):
|
||||
self.root.grid_anchor('nw')
|
||||
super().tearDown()
|
||||
|
||||
def test_grid_configure(self):
|
||||
b = tkinter.Button(self.root)
|
||||
self.addCleanup(b.destroy)
|
||||
self.assertEqual(b.grid_info(), {})
|
||||
b.grid_configure()
|
||||
self.assertEqual(b.grid_info()['in'], self.root)
|
||||
|
|
@ -578,7 +577,6 @@ def test_grid_configure_pady(self):
|
|||
|
||||
def test_grid_configure_row(self):
|
||||
b = tkinter.Button(self.root)
|
||||
self.addCleanup(b.destroy)
|
||||
with self.assertRaisesRegex(TclError, 'bad (row|grid) value "-1": '
|
||||
'must be a non-negative integer'):
|
||||
b.grid_configure(row=-1)
|
||||
|
|
@ -795,7 +793,7 @@ def test_grid_bbox(self):
|
|||
self.root.grid_bbox(0, 0, 0, 'x')
|
||||
with self.assertRaises(TypeError):
|
||||
self.root.grid_bbox(0, 0, 0, 0, 0)
|
||||
t = tkinter.Toplevel(self.root)
|
||||
t = self.root
|
||||
# de-maximize
|
||||
t.wm_geometry('1x1+0+0')
|
||||
t.wm_geometry('')
|
||||
|
|
@ -823,7 +821,7 @@ def test_grid_location(self):
|
|||
self.root.grid_location('x', 'y')
|
||||
with self.assertRaisesRegex(TclError, 'bad screen distance "y"'):
|
||||
self.root.grid_location('1c', 'y')
|
||||
t = tkinter.Toplevel(self.root)
|
||||
t = self.root
|
||||
# de-maximize
|
||||
t.wm_geometry('1x1+0+0')
|
||||
t.wm_geometry('')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue