diff options
| author | Christian Stenger <christian.stenger@digia.com> | 2013-02-04 11:08:38 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@digia.com> | 2013-02-04 16:47:05 +0100 |
| commit | 8485f64c6b659035f9ec7dee61017158a5834828 (patch) | |
| tree | cdfd18a706fd1f214ad5198615223c631992eb9a /tests/system/suite_SCOM | |
| parent | a9f163a4490a36d6b13ab6e99246d1fccaab3d61 (diff) | |
| download | qt-creator-8485f64c6b659035f9ec7dee61017158a5834828.tar.gz | |
Squish: Fix verification of compile output
Change-Id: I1c55e826a79fa0f36d2870cfcb08a325ba6408e1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Diffstat (limited to 'tests/system/suite_SCOM')
| -rw-r--r-- | tests/system/suite_SCOM/tst_SCOM01/test.py | 2 | ||||
| -rw-r--r-- | tests/system/suite_SCOM/tst_SCOM05/test.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/system/suite_SCOM/tst_SCOM01/test.py b/tests/system/suite_SCOM/tst_SCOM01/test.py index 75b33d92d6..b279fc5525 100644 --- a/tests/system/suite_SCOM/tst_SCOM01/test.py +++ b/tests/system/suite_SCOM/tst_SCOM01/test.py @@ -19,7 +19,7 @@ def main(): # check output if build successful ensureChecked(waitForObject(":Qt Creator_CompileOutput_Core::Internal::OutputPaneToggleButton")) compileOutput = waitForObject(":Qt Creator.Compile Output_Core::OutputWindow") - if not test.verify(str(compileOutput.plainText).endswith("exited normally."), + if not test.verify(compileSucceeded(compileOutput.plainText), "Verifying building of simple qt quick application."): test.log(compileOutput.plainText) # exit qt creator diff --git a/tests/system/suite_SCOM/tst_SCOM05/test.py b/tests/system/suite_SCOM/tst_SCOM05/test.py index affea39bcd..505c9ff0c7 100644 --- a/tests/system/suite_SCOM/tst_SCOM05/test.py +++ b/tests/system/suite_SCOM/tst_SCOM05/test.py @@ -44,7 +44,7 @@ def main(): ensureChecked(waitForObject(":Qt Creator_CompileOutput_Core::Internal::OutputPaneToggleButton")) outputLog = str(waitForObject(":Qt Creator.Compile Output_Core::OutputWindow").plainText) # verify that project was built successfully - test.verify(outputLog.endswith("exited normally."), + test.verify(compileSucceeded(outputLog), "Verifying building of simple qt quick application while multiple projects are open.") # verify that proper project (project 2) was build test.verify(projectName2 in outputLog and projectName1 not in outputLog, |