mirror of https://github.com/python/cpython
Use a single Tcl interpreter through all these tests, this may help some
failing buildbots.
This commit is contained in:
parent
3b331dd3ea
commit
905c6b7f48
|
@ -15,6 +15,14 @@ def get_tk_root():
|
|||
|
||||
return root
|
||||
|
||||
def root_deiconify():
|
||||
root = get_tk_root()
|
||||
root.deiconify()
|
||||
|
||||
def root_withdraw():
|
||||
root = get_tk_root()
|
||||
root.withdraw()
|
||||
|
||||
|
||||
def simulate_mouse_click(widget, x, y):
|
||||
"""Generate proper events to click at the x, y position (tries to act
|
||||
|
|
|
@ -10,6 +10,13 @@ requires('gui')
|
|||
|
||||
class LabeledScaleTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
support.root_deiconify()
|
||||
|
||||
def tearDown(self):
|
||||
support.root_withdraw()
|
||||
|
||||
|
||||
def test_widget_destroy(self):
|
||||
# automatically created variable
|
||||
x = ttk.LabeledScale()
|
||||
|
@ -175,12 +182,12 @@ class LabeledScaleTest(unittest.TestCase):
|
|||
class OptionMenuTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.root = support.get_tk_root()
|
||||
self.textvar = Tkinter.StringVar(self.root)
|
||||
support.root_deiconify()
|
||||
self.textvar = Tkinter.StringVar()
|
||||
|
||||
def tearDown(self):
|
||||
del self.textvar
|
||||
self.root.destroy()
|
||||
support.root_withdraw()
|
||||
|
||||
|
||||
def test_widget_destroy(self):
|
||||
|
|
|
@ -10,15 +10,7 @@ requires('gui')
|
|||
class StyleTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.root = support.get_tk_root()
|
||||
self.style = ttk.Style(self.root)
|
||||
|
||||
def tearDown(self):
|
||||
# As tests have shown, these tests are likely to deliver
|
||||
# <<ThemeChanged>> events after the root is destroyed, so
|
||||
# lets let them happen now.
|
||||
self.root.update_idletasks()
|
||||
self.root.destroy()
|
||||
self.style = ttk.Style()
|
||||
|
||||
|
||||
def test_configure(self):
|
||||
|
|
|
@ -12,12 +12,14 @@ class WidgetTest(unittest.TestCase):
|
|||
"""Tests methods available in every ttk widget."""
|
||||
|
||||
def setUp(self):
|
||||
support.root_deiconify()
|
||||
self.widget = ttk.Button()
|
||||
self.widget.pack()
|
||||
self.widget.wait_visibility()
|
||||
|
||||
def tearDown(self):
|
||||
self.widget.destroy()
|
||||
support.root_withdraw()
|
||||
|
||||
|
||||
def test_identify(self):
|
||||
|
@ -107,10 +109,12 @@ class CheckbuttonTest(unittest.TestCase):
|
|||
class ComboboxTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
support.root_deiconify()
|
||||
self.combo = ttk.Combobox()
|
||||
|
||||
def tearDown(self):
|
||||
self.combo.destroy()
|
||||
support.root_withdraw()
|
||||
|
||||
def _show_drop_down_listbox(self):
|
||||
width = self.combo.winfo_width()
|
||||
|
@ -195,10 +199,12 @@ class ComboboxTest(unittest.TestCase):
|
|||
class EntryTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
support.root_deiconify()
|
||||
self.entry = ttk.Entry()
|
||||
|
||||
def tearDown(self):
|
||||
self.entry.destroy()
|
||||
support.root_withdraw()
|
||||
|
||||
|
||||
def test_bbox(self):
|
||||
|
@ -297,10 +303,12 @@ class EntryTest(unittest.TestCase):
|
|||
class PanedwindowTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
support.root_deiconify()
|
||||
self.paned = ttk.Panedwindow()
|
||||
|
||||
def tearDown(self):
|
||||
self.paned.destroy()
|
||||
support.root_withdraw()
|
||||
|
||||
|
||||
def test_add(self):
|
||||
|
@ -445,12 +453,14 @@ class RadiobuttonTest(unittest.TestCase):
|
|||
class ScaleTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
support.root_deiconify()
|
||||
self.scale = ttk.Scale()
|
||||
self.scale.pack()
|
||||
self.scale.update()
|
||||
|
||||
def tearDown(self):
|
||||
self.scale.destroy()
|
||||
support.root_withdraw()
|
||||
|
||||
|
||||
def test_custom_event(self):
|
||||
|
@ -519,6 +529,7 @@ class ScaleTest(unittest.TestCase):
|
|||
class NotebookTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
support.root_deiconify()
|
||||
self.nb = ttk.Notebook()
|
||||
self.child1 = ttk.Label()
|
||||
self.child2 = ttk.Label()
|
||||
|
@ -529,6 +540,7 @@ class NotebookTest(unittest.TestCase):
|
|||
self.child1.destroy()
|
||||
self.child2.destroy()
|
||||
self.nb.destroy()
|
||||
support.root_withdraw()
|
||||
|
||||
|
||||
def test_tab_identifiers(self):
|
||||
|
@ -708,13 +720,12 @@ class NotebookTest(unittest.TestCase):
|
|||
class TreeviewTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.root = support.get_tk_root()
|
||||
self.tv = ttk.Treeview(self.root)
|
||||
support.root_deiconify()
|
||||
self.tv = ttk.Treeview()
|
||||
|
||||
def tearDown(self):
|
||||
self.tv.destroy()
|
||||
self.root.update_idletasks()
|
||||
self.root.destroy()
|
||||
support.root_withdraw()
|
||||
|
||||
|
||||
def test_bbox(self):
|
||||
|
|
Loading…
Reference in New Issue