feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Stabilize selectBuildConfig(...)

Browse Source 
Change-Id: Iba111e8cbbe652dd488b4dc91c58b92f53eccba3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2019-10-29 13:34:55 +01:00
parent 61fa3e8704
commit 775c78eca8
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/system/shared/build_utils.py
View File

@@ -155,7 +155,7 @@ def selectBuildConfig(wantedKit, configName, afterSwitchTo=ViewConstants.EDIT):
switchViewTo(ViewConstants.PROJECTS) switchViewTo(ViewConstants.PROJECTS)
if any((switchToBuildOrRunSettingsFor(wantedKit, ProjectSettings.BUILD), if any((switchToBuildOrRunSettingsFor(wantedKit, ProjectSettings.BUILD),
selectFromCombo(":scrollArea.Edit build configuration:_QComboBox", configName))): selectFromCombo(":scrollArea.Edit build configuration:_QComboBox", configName))):
progressBarWait(30000) waitForProjectParsing(5000, 30000, 0)
if afterSwitchTo: if afterSwitchTo:
if ViewConstants.FIRST_AVAILABLE <= afterSwitchTo <= ViewConstants.LAST_AVAILABLE: if ViewConstants.FIRST_AVAILABLE <= afterSwitchTo <= ViewConstants.LAST_AVAILABLE:
switchViewTo(afterSwitchTo) switchViewTo(afterSwitchTo)

10
tests/system/shared/project.py
View File

@@ -673,10 +673,14 @@ def addCPlusPlusFile(name, template, projectName, forceOverwrite=False, addToVCS
clickButton("{text='%s' type='QPushButton' unnamed='1' visible='1' window=%s}" clickButton("{text='%s' type='QPushButton' unnamed='1' visible='1' window=%s}"
% (buttonToClick, overwriteDialog)) % (buttonToClick, overwriteDialog))
# if one of the parameters is set to 0 or below the respective parsing won't be waited for # if one of the parameters is set to 0 the function will not wait in this step
def waitForProjectParsing(projectParsingTimeout=10000, codemodelParsingTimeout=10000): # beginParsingTimeout milliseconds to wait for parsing to begin
if projectParsingTimeout > 0: # projectParsingTimeout milliseconds to wait for project parsing
# codemodelParsingTimeout milliseconds to wait for C++ parsing
def waitForProjectParsing(beginParsingTimeout=0, projectParsingTimeout=10000,
codemodelParsingTimeout=10000):
runButton = findObject(':*Qt Creator.Run_Core::Internal::FancyToolButton') runButton = findObject(':*Qt Creator.Run_Core::Internal::FancyToolButton')
waitFor("not runButton.enabled", beginParsingTimeout)
# Wait for parsing to complete # Wait for parsing to complete
waitFor("runButton.enabled", projectParsingTimeout) waitFor("runButton.enabled", projectParsingTimeout)
if codemodelParsingTimeout > 0: if codemodelParsingTimeout > 0: