summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@digia.com>2014-08-14 12:37:22 +0200
committerRobert Loehning <robert.loehning@digia.com>2014-08-14 12:55:12 +0200
commit75ec15e84971727c2e03a4aa741cce389ed7d1e6 (patch)
tree0305e521e583c43113f4e6e0db3604bf8ebe20cf
parent9109dd465b7fcdad822a0be804d63446f76c398a (diff)
downloadqt-creator-75ec15e84971727c2e03a4aa741cce389ed7d1e6.tar.gz
Squish: Fix tst_codepasting
Test crashed when there was unexpected output Change-Id: I6fd56bf95d664cff5284e574db9b57f42b0e93cf Reviewed-by: Christian Stenger <christian.stenger@digia.com>
-rw-r--r--tests/system/suite_tools/tst_codepasting/test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/system/suite_tools/tst_codepasting/test.py b/tests/system/suite_tools/tst_codepasting/test.py
index 01423f729d..8fd72a8c36 100644
--- a/tests/system/suite_tools/tst_codepasting/test.py
+++ b/tests/system/suite_tools/tst_codepasting/test.py
@@ -71,8 +71,8 @@ def main():
aut.readStderr()
clickButton(waitForObject(":Send to Codepaster.Paste_QPushButton"))
outputWindow = waitForObject(":Qt Creator_Core::OutputWindow")
- waitFor("not outputWindow.plainText.isEmpty()", 20000)
- output = str(outputWindow.plainText)
+ waitFor("'http://' in str(outputWindow.plainText)", 20000)
+ output = str(outputWindow.plainText).splitlines()[-1]
stdErrOut = aut.readStderr()
match = re.search("^%s protocol error: (.*)$" % protocol, stdErrOut, re.MULTILINE)
if match: