Don't do unnecessary condition evaluations in assertEventuallyTrueInGui

pyface/tests/test_color_dialog.py

@@ -80,7 +80,7 @@ def test_close(self):
         tester = ModalDialogTester(
             lambda: get_color(None, "rebeccapurple")
         )
-        tester.open_and_run(when_opened=lambda x: x.close(accept=False))
+        tester.open_and_wait(when_opened=lambda x: x.close(accept=False))
 
         self.assertEqual(tester.result, None)
 
@@ -90,6 +90,6 @@ def test_close_show_alpha(self):
         tester = ModalDialogTester(
             lambda: get_color(None, "rebeccapurple", True)
         )
-        tester.open_and_run(when_opened=lambda x: x.close(accept=False))
+        tester.open_and_wait(when_opened=lambda x: x.close(accept=False))
 
         self.assertEqual(tester.result, None)

pyface/tests/test_font_dialog.py

@@ -82,6 +82,6 @@ def test_close(self):
         tester = ModalDialogTester(
             lambda: get_font(None, "12 Helvetica sans-serif")
         )
-        tester.open_and_run(when_opened=lambda x: x.close(accept=False))
+        tester.open_and_wait(when_opened=lambda x: x.close(accept=False))
 
         self.assertEqual(tester.result, None)

pyface/ui/qt4/util/event_loop_helper.py

@@ -111,9 +111,14 @@ def event_loop_until_condition(self, condition, timeout=10.0):
             `timeout` is rounded to the nearest millisecond.
         """
 
+        condition_result = False
+
         def handler():
-            if condition():
-                self.qt_app.quit()
+            nonlocal condition_result
+
+            condition_result = bool(condition())
+            if condition_result:
+                self.qt_app.exit()
 
         # Make sure we don't get a premature exit from the event loop.
         with dont_quit_when_last_window_closed(self.qt_app):
@@ -123,12 +128,12 @@ def handler():
             timeout_timer = QtCore.QTimer()
             timeout_timer.setSingleShot(True)
             timeout_timer.setInterval(round(timeout * 1000))
-            timeout_timer.timeout.connect(self.qt_app.quit)
+            timeout_timer.timeout.connect(self.qt_app.exit)
             timeout_timer.start()
             condition_timer.start()
             try:
                 self.qt_app.exec_()
-                if not condition():
+                if not condition_result:
                     raise ConditionTimeoutError(
                         "Timed out waiting for condition"
                     )

pyface/ui/qt4/util/tests/test_gui_test_assistant.py

@@ -7,6 +7,7 @@
 # is also available online at http://www.enthought.com/licenses/BSD.txt
 #
 # Thanks for using Enthought open source!
+import itertools
 import unittest
 
 from pyface.timer.api import CallbackTimer
@@ -94,3 +95,37 @@ def test_assert_eventually_true_in_gui_failure(self):
             self.assertEventuallyTrueInGui(
                 lambda: len(my_list) > 0, timeout=0.1
             )
+
+    def test_assert_eventually_true_in_gui_dont_retest_immediately_true(self):
+        # Given an always-True condition
+        return_value_logs = []
+
+        def logging_condition():
+            return_value = True
+            return_value_logs.append(return_value)
+            return return_value
+
+        # When we wait for the condition to become true
+        self.assertEventuallyTrueInGui(logging_condition)
+
+        # Then the condition should have been evaluated exactly once.
+        self.assertEqual(return_value_logs, [True])
+
+    def test_assert_eventually_true_in_gui_dont_retest_eventually_true(self):
+        # Given a condition that returns two False values, followed by
+        # infinitely many True values ...
+        return_values = itertools.chain([False]*2, itertools.repeat(True))
+
+        return_value_logs = []
+
+        def logging_condition():
+            return_value = next(return_values)
+            return_value_logs.append(return_value)
+            return return_value
+
+        # When we wait for the condition to become true
+        self.assertEventuallyTrueInGui(logging_condition)
+
+        # Then the condition should not have been evaluated again after
+        # becoming True.
+        self.assertEqual(return_value_logs.count(True), 1)