From 7f2e86a72c7698f346c83f1f5c7adc606583ddde Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 23 Oct 2019 18:34:41 -0700 Subject: [PATCH] Show and Destroy the test dialogs on Macs, yield after update, and more test fixes --- unittests/test_dialog.py | 4 ++++ unittests/test_sizer.py | 4 +++- unittests/wtc.py | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/unittests/test_dialog.py b/unittests/test_dialog.py index 911e4484..6b36cf33 100644 --- a/unittests/test_dialog.py +++ b/unittests/test_dialog.py @@ -20,6 +20,10 @@ class dialog_Tests(wtc.WidgetTestCase): dlg.Destroy() self.assertTrue(val == wx.ID_OK) self.myYield() + else: + dlg.Show() + dlg.Destroy() + self.myYield() def test_dialogDefaultCtor(self): diff --git a/unittests/test_sizer.py b/unittests/test_sizer.py index 7703c972..af432fe5 100644 --- a/unittests/test_sizer.py +++ b/unittests/test_sizer.py @@ -74,12 +74,14 @@ class sizer_Tests(wtc.WidgetTestCase): def test_iter(self): bs = wx.BoxSizer() widgetlist = [wx.Panel(self.frame) for _ in range(5)] + for w in widgetlist: + bs.Add(w) sizeritems = [x for x in bs] for item in sizeritems: self.assertTrue(isinstance(item, wx.SizerItem)) - self.assertTrue([x.GetWidget() for x in bs] == widgetlist) + self.assertEqual([x.GetWindow() for x in bs], widgetlist) def test_sizerSpacers1(self): bs = wx.BoxSizer() diff --git a/unittests/wtc.py b/unittests/wtc.py index 53408674..c9cfa41e 100644 --- a/unittests/wtc.py +++ b/unittests/wtc.py @@ -57,6 +57,7 @@ class WidgetTestCase(unittest.TestCase): if 'wxOSX' in wx.PlatformInfo: wx.MilliSleep(40) # a little more than 1/30, just in case window.Update() + self.myYield() def closeDialogs(self):