diff --git a/source/core.py b/source/core.py index 5c6f56b8a8f..f8233540ee0 100644 --- a/source/core.py +++ b/source/core.py @@ -584,10 +584,16 @@ def run(self): log.debug("initializing updateCheck") updateCheck.initialize() log.info("NVDA initialized") + # Queue the firing of the postNVDAStartup notification. # This is queued so that it will run from within the core loop, # and initial focus has been reported. - queueHandler.queueFunction(queueHandler.eventQueue, postNvdaStartup.notify) + def _doPostNvdaStartupAction(): + log.debug("Notify of postNvdaStartup action") + postNvdaStartup.notify() + + queueHandler.queueFunction(queueHandler.eventQueue, _doPostNvdaStartupAction) + log.debug("entering wx application main loop") app.MainLoop() diff --git a/tests/system/libraries/SystemTestSpy/speechSpyGlobalPlugin.py b/tests/system/libraries/SystemTestSpy/speechSpyGlobalPlugin.py index 365daee455c..fe5868cd888 100644 --- a/tests/system/libraries/SystemTestSpy/speechSpyGlobalPlugin.py +++ b/tests/system/libraries/SystemTestSpy/speechSpyGlobalPlugin.py @@ -159,8 +159,7 @@ def wait_for_NVDA_startup_to_complete(self): giveUpAfterSeconds=self._minTimeout(10), errorMessage="Unable to connect to nvdaSpy", ) - if self._isNvdaStartupComplete: - self.reset_all_speech_index() + self.reset_all_speech_index() def get_last_speech(self) -> str: return self._getSpeechAtIndex(-1) diff --git a/tests/system/robot/chromeTests.robot b/tests/system/robot/chromeTests.robot index bcf5b91d000..01c33755681 100644 --- a/tests/system/robot/chromeTests.robot +++ b/tests/system/robot/chromeTests.robot @@ -12,7 +12,7 @@ Library NvdaLib.py Library chromeTests.py Library ScreenCapLibrary -Test Setup start NVDA standard-dontShowWelcomeDialog.ini +Test Setup default setup Test Teardown default teardown *** Keywords *** @@ -22,6 +22,10 @@ default teardown exit chrome quit NVDA +default setup + start NVDA standard-dontShowWelcomeDialog.ini + Sleep 2s + *** Test Cases *** checkbox labelled by inner element