diff options
| -rwxr-xr-x | tests/system/suite_WELP/tst_WELP01/test.py | 5 | ||||
| -rw-r--r-- | tests/system/suite_WELP/tst_WELP02/test.py | 5 | ||||
| -rw-r--r-- | tests/system/suite_WELP/tst_WELP03/test.py | 5 | ||||
| -rw-r--r-- | tests/system/suite_WELP/tst_WELP04/test.py | 5 | ||||
| -rw-r--r-- | tests/system/suite_general/tst_session_handling/test.py | 5 |
5 files changed, 8 insertions, 17 deletions
diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py index 23151ce4ae..ea590c899f 100755 --- a/tests/system/suite_WELP/tst_WELP01/test.py +++ b/tests/system/suite_WELP/tst_WELP01/test.py @@ -55,9 +55,8 @@ def clickItemVerifyHelpCombo(qmlItem, expectedHelpComboRegex, testDetails): "Verifying: Getting Started topic is being displayed.") def main(): - if isQt4Build: - test.log("Welcome mode is only available if Creator was built on Qt 5") - return + test.log("Welcome mode is not scriptable at the moment") + return global webPageContentLoadedValue, gettingStartedText # open Qt Creator startApplication("qtcreator" + SettingsPath) diff --git a/tests/system/suite_WELP/tst_WELP02/test.py b/tests/system/suite_WELP/tst_WELP02/test.py index 58f0df9d29..6a0e8f4922 100644 --- a/tests/system/suite_WELP/tst_WELP02/test.py +++ b/tests/system/suite_WELP/tst_WELP02/test.py @@ -31,9 +31,8 @@ source("../../shared/qtcreator.py") source("../../shared/suites_qtta.py") def main(): - if isQt4Build: - test.log("Welcome mode is only available if Creator was built on Qt 5") - return + test.log("Welcome mode is not scriptable at the moment") + return # prepare example project sourceExample = os.path.join(sdkPath, "Examples", "4.7", "declarative", "animation", "basics", "property-animation") diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py index 58c5ca3462..d7ddec4654 100644 --- a/tests/system/suite_WELP/tst_WELP03/test.py +++ b/tests/system/suite_WELP/tst_WELP03/test.py @@ -60,9 +60,8 @@ def handlePackagingMessageBoxes(): break def main(): - if isQt4Build: - test.log("Welcome mode is only available if Creator was built on Qt 5") - return + test.log("Welcome mode is not scriptable at the moment") + return global sdkPath, webPageContentLoadedValue # open Qt Creator startApplication("qtcreator" + SettingsPath) diff --git a/tests/system/suite_WELP/tst_WELP04/test.py b/tests/system/suite_WELP/tst_WELP04/test.py index f806dee7d1..7257e1974c 100644 --- a/tests/system/suite_WELP/tst_WELP04/test.py +++ b/tests/system/suite_WELP/tst_WELP04/test.py @@ -31,9 +31,8 @@ source("../../shared/qtcreator.py") source("../../shared/suites_qtta.py") def main(): - if isQt4Build: - test.log("Welcome mode is only available if Creator was built on Qt 5") - return + test.log("Welcome mode is not scriptable at the moment") + return # open Qt Creator startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): diff --git a/tests/system/suite_general/tst_session_handling/test.py b/tests/system/suite_general/tst_session_handling/test.py index 85000ef8fd..93e56a0f94 100644 --- a/tests/system/suite_general/tst_session_handling/test.py +++ b/tests/system/suite_general/tst_session_handling/test.py @@ -41,8 +41,6 @@ def main(): mainWindow = waitForObject(":Qt Creator_Core::Internal::MainWindow") test.verify(waitFor("sessionName in str(mainWindow.windowTitle)", 2000), "Verifying window title contains created session name.") - if not isQt4Build: - checkWelcomePage(sessionName, True) for project in projects: openQmakeProject(project) progressBarWait(20000) @@ -54,9 +52,6 @@ def main(): switchSession("default") test.verify(waitFor("'Qt Creator' == str(mainWindow.windowTitle)", 2000), "Verifying window title is set to default.") - if not isQt4Build: - checkWelcomePage(sessionName, False) - switchViewTo(ViewConstants.EDIT) checkNavigator(1, "Verifying that no more project is opened.") checkOpenDocuments(0, "Verifying whether all files have been closed.") switchSession(sessionName) |