diff options
| author | Christian Stenger <christian.stenger@theqtcompany.com> | 2014-12-03 07:49:32 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@theqtcompany.com> | 2014-12-03 12:09:29 +0100 |
| commit | 64d6d64c933711afbb32c4ecf91c168d82f8e407 (patch) | |
| tree | fa1d67f316558bf12719bc77459a80ed3d4131b9 | |
| parent | 3d4cedb1f065a87c95daafbadd7aeb0bc044c969 (diff) | |
| download | qt-creator-64d6d64c933711afbb32c4ecf91c168d82f8e407.tar.gz | |
Squish: Let test continue instead of crashing on protocol error
Change-Id: I3c862d26fbbdf124c0b347225cfd97e0748a0830
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
| -rw-r--r-- | tests/system/suite_tools/tst_codepasting/test.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/system/suite_tools/tst_codepasting/test.py b/tests/system/suite_tools/tst_codepasting/test.py index c26e74ffb3..6aefb5ee7a 100644 --- a/tests/system/suite_tools/tst_codepasting/test.py +++ b/tests/system/suite_tools/tst_codepasting/test.py @@ -73,7 +73,10 @@ def main(): clickButton(waitForObject(":Send to Codepaster.Paste_QPushButton")) outputWindow = waitForObject(":Qt Creator_Core::OutputWindow") waitFor("'http://' in str(outputWindow.plainText)", 20000) - output = str(outputWindow.plainText).splitlines()[-1] + try: + output = str(outputWindow.plainText).splitlines()[-1] + except: + output = "" stdErrOut = aut.readStderr() match = re.search("^%s protocol error: (.*)$" % protocol, stdErrOut, re.MULTILINE) if match: |