Merge remote-tracking branch 'origin/main' into fix/update-edm

Author: mdickinson

pyface/tasks/tests/test_tasks_application.py

@@ -134,10 +134,14 @@ def test_lifecycle(self):
         app = TasksApplication()
         self.connect_listeners(app)
         window = ApplicationWindow()
-        app.observe(lambda _: app.add_window(window), "started")
+
+        def on_started(event):
+            app.add_window(window)
+            self.gui.invoke_after(100, app.exit)
+
+        app.observe(on_started, "started")
 
         with self.assertMultiTraitChanges([app], EVENTS, []):
-            self.gui.invoke_after(1000, app.exit)
             result = app.run()
 
         self.assertTrue(result)

pyface/tests/test_gui_application.py

@@ -167,8 +167,12 @@ def test_lifecycle(self):
         window = ApplicationWindow()
         app.observe(lambda _: app.add_window(window), "started")
 
+        def on_started(event):
+            self.gui.invoke_after(100, app.exit)
+
+        app.observe(on_started, "started")
+
         with self.assertMultiTraitChanges([app], EVENTS, []):
-            self.gui.invoke_after(1000, app.exit)
             result = app.run()
 
         self.assertTrue(result)
@@ -180,9 +184,14 @@ def test_exit_prepare_error(self):
         app = TestingApp(exit_prepared_error=True)
         self.connect_listeners(app)
 
-        with self.assertMultiTraitChanges([app], EVENTS, []):
-            self.gui.invoke_after(1000, app.exit)
-            result = app.run()
+        def on_started(event):
+            self.gui.invoke_after(100, app.exit)
+
+        app.observe(on_started, "started")
+
+        with self.assertLogs("pyface.application", "WARNING") as logs_cm:
+            with self.assertMultiTraitChanges([app], EVENTS, []):
+                result = app.run()
 
         self.assertTrue(result)
         self.assertFalse(app.exit_vetoed)
@@ -191,6 +200,10 @@ def test_exit_prepare_error(self):
         self.assertEqual(event_order, EVENTS)
         self.assertEqual(app.windows, [])
 
+        self.assertEqual(len(logs_cm.output), 1)
+        [log_output] = logs_cm.output
+        self.assertIn("Error preparing for application exit", log_output)
+
     def test_veto_exit(self):
         app = TestingApp(veto_exit=True)
         self.connect_listeners(app)
@@ -211,8 +224,12 @@ def test_veto_open_window(self):
         app = TestingApp(veto_open_window=True)
         self.connect_listeners(app)
 
-        with self.assertMultiTraitChanges([app], EVENTS, []):
+        def on_started(event):
             self.gui.invoke_after(1000, app.exit)
+
+        app.observe(on_started, "started")
+
+        with self.assertMultiTraitChanges([app], EVENTS, []):
             result = app.run()
 
         self.assertTrue(result)
@@ -227,9 +244,13 @@ def test_veto_close_window(self):
         app = TestingApp(veto_close_window=True)
         self.connect_listeners(app)
 
-        with self.assertMultiTraitChanges([app], EVENTS, []):
+        def on_started(event):
             self.gui.invoke_after(1000, app.exit)
             self.gui.invoke_after(2000, app.exit, force=True)
+
+        app.observe(on_started, "started")
+
+        with self.assertMultiTraitChanges([app], EVENTS, []):
             result = app.run()
 
         self.assertTrue(result)
@@ -243,8 +264,12 @@ def test_force_exit(self):
         app = TestingApp(do_exit=True, force_exit=True, veto_exit=True)
         self.connect_listeners(app)
 
-        with self.assertMultiTraitChanges([app], EVENTS, []):
+        def on_started(event):
             self.gui.invoke_after(100, app.exit, True)
+
+        app.observe(on_started, "started")
+
+        with self.assertMultiTraitChanges([app], EVENTS, []):
             result = app.run()
 
         self.assertTrue(result)
@@ -258,8 +283,12 @@ def test_force_exit_close_veto(self):
         app = TestingApp(do_exit=True, force_exit=True, veto_close_window=True)
         self.connect_listeners(app)
 
+        def on_started(event):
+            self.gui.invoke_after(100, app.exit, True)
+
+        app.observe(on_started, "started")
+
         with self.assertMultiTraitChanges([app], EVENTS, []):
-            self.gui.invoke_after(1000, app.exit, True)
             result = app.run()
 
         self.assertTrue(result)
@@ -285,8 +314,12 @@ def test_bad_stop(self):
         app = TestingApp(stop_cleanly=False)
         self.connect_listeners(app)
 
+        def on_started(event):
+            self.gui.invoke_after(100, app.exit)
+
+        app.observe(on_started, "started")
+
         with self.assertMultiTraitChanges([app], EVENTS[:-1], EVENTS[-1:]):
-            self.gui.invoke_after(1000, app.exit, True)
             result = app.run()
 
         self.assertFalse(result)