Commit a1274c93 authored by Robert Loehning's avatar Robert Loehning
Browse files

Squish: Temporarily disable testing of Welcome mode



Change-Id: I9d8764d11298094c302ae3c979e3bbc23ec68e20
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent 36f14934
...@@ -55,8 +55,7 @@ def clickItemVerifyHelpCombo(qmlItem, expectedHelpComboRegex, testDetails): ...@@ -55,8 +55,7 @@ def clickItemVerifyHelpCombo(qmlItem, expectedHelpComboRegex, testDetails):
"Verifying: Getting Started topic is being displayed.") "Verifying: Getting Started topic is being displayed.")
def main(): def main():
if isQt4Build: test.log("Welcome mode is not scriptable at the moment")
test.log("Welcome mode is only available if Creator was built on Qt 5")
return return
global webPageContentLoadedValue, gettingStartedText global webPageContentLoadedValue, gettingStartedText
# open Qt Creator # open Qt Creator
......
...@@ -31,8 +31,7 @@ source("../../shared/qtcreator.py") ...@@ -31,8 +31,7 @@ source("../../shared/qtcreator.py")
source("../../shared/suites_qtta.py") source("../../shared/suites_qtta.py")
def main(): def main():
if isQt4Build: test.log("Welcome mode is not scriptable at the moment")
test.log("Welcome mode is only available if Creator was built on Qt 5")
return return
# prepare example project # prepare example project
sourceExample = os.path.join(sdkPath, "Examples", "4.7", "declarative", "animation", "basics", sourceExample = os.path.join(sdkPath, "Examples", "4.7", "declarative", "animation", "basics",
......
...@@ -60,8 +60,7 @@ def handlePackagingMessageBoxes(): ...@@ -60,8 +60,7 @@ def handlePackagingMessageBoxes():
break break
def main(): def main():
if isQt4Build: test.log("Welcome mode is not scriptable at the moment")
test.log("Welcome mode is only available if Creator was built on Qt 5")
return return
global sdkPath, webPageContentLoadedValue global sdkPath, webPageContentLoadedValue
# open Qt Creator # open Qt Creator
......
...@@ -31,8 +31,7 @@ source("../../shared/qtcreator.py") ...@@ -31,8 +31,7 @@ source("../../shared/qtcreator.py")
source("../../shared/suites_qtta.py") source("../../shared/suites_qtta.py")
def main(): def main():
if isQt4Build: test.log("Welcome mode is not scriptable at the moment")
test.log("Welcome mode is only available if Creator was built on Qt 5")
return return
# open Qt Creator # open Qt Creator
startApplication("qtcreator" + SettingsPath) startApplication("qtcreator" + SettingsPath)
......
...@@ -41,8 +41,6 @@ def main(): ...@@ -41,8 +41,6 @@ def main():
mainWindow = waitForObject(":Qt Creator_Core::Internal::MainWindow") mainWindow = waitForObject(":Qt Creator_Core::Internal::MainWindow")
test.verify(waitFor("sessionName in str(mainWindow.windowTitle)", 2000), test.verify(waitFor("sessionName in str(mainWindow.windowTitle)", 2000),
"Verifying window title contains created session name.") "Verifying window title contains created session name.")
if not isQt4Build:
checkWelcomePage(sessionName, True)
for project in projects: for project in projects:
openQmakeProject(project) openQmakeProject(project)
progressBarWait(20000) progressBarWait(20000)
...@@ -54,9 +52,6 @@ def main(): ...@@ -54,9 +52,6 @@ def main():
switchSession("default") switchSession("default")
test.verify(waitFor("'Qt Creator' == str(mainWindow.windowTitle)", 2000), test.verify(waitFor("'Qt Creator' == str(mainWindow.windowTitle)", 2000),
"Verifying window title is set to default.") "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.") checkNavigator(1, "Verifying that no more project is opened.")
checkOpenDocuments(0, "Verifying whether all files have been closed.") checkOpenDocuments(0, "Verifying whether all files have been closed.")
switchSession(sessionName) switchSession(sessionName)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment