From 51cc14c738748d359df34e2bd1154b1a2da0df1c Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 27 Jan 2020 10:28:24 +0100 Subject: [PATCH] Squish: Close Link with Qt banner at startup Change-Id: I02e9a1b4eecc21804a2570a72cbdc0b19ae4f7a1 Reviewed-by: Robert Loehning --- tests/system/shared/clang.py | 2 +- tests/system/shared/qtcreator.py | 4 +++- tests/system/suite_general/tst_installed_languages/test.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/system/shared/clang.py b/tests/system/shared/clang.py index 99bb1b6f947..cccafa8a205 100644 --- a/tests/system/shared/clang.py +++ b/tests/system/shared/clang.py @@ -30,7 +30,7 @@ def startCreatorVerifyingClang(useClang): try: # start Qt Creator with / without enabled ClangCodeModel plugin (without modifying settings) loadOrNoLoad = '-load' if useClang else '-noload' - startQC([loadOrNoLoad, 'ClangCodeModel'], cancelTour=firstStart) + startQC([loadOrNoLoad, 'ClangCodeModel'], closeLinkToQt=firstStart, cancelTour=firstStart) firstStart = False except RuntimeError: t, v = sys.exc_info()[:2] diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py index 7d2a45490a6..295a9ed2cff 100644 --- a/tests/system/shared/qtcreator.py +++ b/tests/system/shared/qtcreator.py @@ -55,7 +55,7 @@ source("../../shared/welcome.py") source("../../shared/workarounds.py") # include this at last # additionalParameters must be a list or tuple of strings or None -def startQC(additionalParameters=None, withPreparedSettingsPath=True, cancelTour=True): +def startQC(additionalParameters=None, withPreparedSettingsPath=True, closeLinkToQt=True, cancelTour=True): global SettingsPath appWithOptions = ['"Qt Creator"' if platform.system() == 'Darwin' else "qtcreator"] if withPreparedSettingsPath: @@ -66,6 +66,8 @@ def startQC(additionalParameters=None, withPreparedSettingsPath=True, cancelTour appWithOptions.extend(('-platform', 'windows:dialogs=none')) test.log("Starting now: %s" % ' '.join(appWithOptions)) appContext = startApplication(' '.join(appWithOptions)) + if closeLinkToQt: + clickButton(waitForObject(":*Qt Creator.Do Not Show Again_QToolButton")) if cancelTour: clickButton(waitForObject(":*Qt Creator.Do Not Show Again_QToolButton")) return appContext; diff --git a/tests/system/suite_general/tst_installed_languages/test.py b/tests/system/suite_general/tst_installed_languages/test.py index a1ac0177427..7a5be9b680e 100644 --- a/tests/system/suite_general/tst_installed_languages/test.py +++ b/tests/system/suite_general/tst_installed_languages/test.py @@ -45,7 +45,7 @@ def main(): invokeMenuItem("File", "Exit") waitForCleanShutdown() snooze(4) # wait for complete unloading of Creator - startQC(cancelTour=False) + startQC(closeLinkToQt=False, cancelTour=False) try: # Use Locator for menu items which wouldn't work on macOS exitCommand = testData.field(lang, "Exit")