diff options
| author | Robert Loehning <robert.loehning@digia.com> | 2012-10-29 19:31:17 +0100 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@digia.com> | 2012-10-30 09:54:50 +0100 |
| commit | b565197145a91fd3a81f2986a8395e084e63c4bd (patch) | |
| tree | f71ebde9e8b187ee2b1a003cfa9ea6b894b1b9f3 /tests/system/suite_APTW | |
| parent | e60d2af0b18c03eb333eedf9bafe9e053d50af87 (diff) | |
Squish: Updated function pickVersion474runVerify()
Change-Id: I02733645a6367429ce97007cfa4b882534786d78
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'tests/system/suite_APTW')
| -rwxr-xr-x | tests/system/suite_APTW/shared/aptw.py | 6 | ||||
| -rw-r--r-- | tests/system/suite_APTW/tst_APTW01/test.py | 7 | ||||
| -rw-r--r-- | tests/system/suite_APTW/tst_APTW02/test.py | 7 |
3 files changed, 9 insertions, 11 deletions
diff --git a/tests/system/suite_APTW/shared/aptw.py b/tests/system/suite_APTW/shared/aptw.py index 313b9c20630..94497fcac42 100755 --- a/tests/system/suite_APTW/shared/aptw.py +++ b/tests/system/suite_APTW/shared/aptw.py @@ -13,11 +13,11 @@ def verifyBuildAndRun(): re.search('[Ss]tarting.*', str(appOutput)), "Verifying if built app started and closed successfully.") -# pick version 4.7.4 and then run project for debug and release -def pickVersion474runVerify(): +# run project for debug and release +def runVerify(): availableConfigs = iterateBuildConfigs(1) if not availableConfigs: - test.fatal("Haven't found needed Qt version (Qt 4.7.4), quitting") + test.fatal("Haven't found build configurations, quitting") invokeMenuItem("File", "Save All") invokeMenuItem("File", "Exit") # select debug configuration diff --git a/tests/system/suite_APTW/tst_APTW01/test.py b/tests/system/suite_APTW/tst_APTW01/test.py index f569699e314..9b6dc46ad91 100644 --- a/tests/system/suite_APTW/tst_APTW01/test.py +++ b/tests/system/suite_APTW/tst_APTW01/test.py @@ -6,8 +6,7 @@ source("../shared/aptw.py") def main(): startApplication("qtcreator" + SettingsPath) createProject_Qt_GUI(tempDir(), "SampleApp") - # pick version 4.7.4 and then run project for debug and release and verify results - pickVersion474runVerify() - #close Qt creator + # run project for debug and release and verify results + runVerify() + #close Qt Creator invokeMenuItem("File", "Exit") -#no cleanup needed diff --git a/tests/system/suite_APTW/tst_APTW02/test.py b/tests/system/suite_APTW/tst_APTW02/test.py index d9711ba590b..f71de88cacc 100644 --- a/tests/system/suite_APTW/tst_APTW02/test.py +++ b/tests/system/suite_APTW/tst_APTW02/test.py @@ -7,8 +7,7 @@ def main(): startApplication("qtcreator" + SettingsPath) createNewQtQuickApplication(tempDir(), "SampleApp") waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)") - # pick version 4.7.4 and then run project for debug and release and verify results - pickVersion474runVerify() - #close Qt creator + # run project for debug and release and verify results + runVerify() + #close Qt Creator invokeMenuItem("File", "Exit") -#no cleanup needed |