diff options
| author | Christian Stenger <christian.stenger@nokia.com> | 2011-09-21 17:29:18 +0200 |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2011-09-22 16:31:34 +0200 |
| commit | 11f7dbda774aa586fbc3940e52e271ba70a2b8c4 (patch) | |
| tree | 288dee6590155e59b7102ea3870a0a86fb888d8b /tests/system/suite_qtquick/tst_qtquick_creation2/test.py | |
| parent | ddacec3eb557772467d0a968ada014c69430a132 (diff) | |
| download | qt-creator-11f7dbda774aa586fbc3940e52e271ba70a2b8c4.tar.gz | |
Added new qml test and continue refactoring
Refactoring of all helper functions to make it easier to
recognize them as such. All helper functions in global
shared scripts now follow the scheme __NAME__
Helper functions normally should not get called from outside.
Change-Id: I0d02028d3f9de1ad251af9226c0460655bd9c9bd
Reviewed-on: http://codereview.qt-project.org/5331
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Diffstat (limited to 'tests/system/suite_qtquick/tst_qtquick_creation2/test.py')
| -rw-r--r-- | tests/system/suite_qtquick/tst_qtquick_creation2/test.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/system/suite_qtquick/tst_qtquick_creation2/test.py b/tests/system/suite_qtquick/tst_qtquick_creation2/test.py index 418ca6c1e4..a74f2b6a71 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation2/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation2/test.py @@ -45,7 +45,7 @@ def createNewQtQuickApplication(): if cbDefaultLocation.checked: clickButton(cbDefaultLocation) # now there's the 'untitled' project inside a temporary directory - step forward...! - nextButton = waitForObject("{text='Next' type='QPushButton' visible='1'}", 20000) + nextButton = waitForObject("{text?='Next*' type='QPushButton' visible='1'}", 20000) clickButton(nextButton) chooseComponents(QtQuickConstants.Components.EXISTING_QML) # define the existing qml file to import @@ -60,8 +60,7 @@ def createNewQtQuickApplication(): def cleanup(): global workingDir,templateDir # waiting for a clean exit - for a full-remove of the temp directory - appCtxt = currentApplicationContext() - waitFor("appCtxt.isRunning==False") + waitForCleanShutdown() if workingDir!=None: deleteDirIfExists(workingDir) if templateDir!=None: |