summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@digia.com>2014-09-02 13:13:07 +0200
committerRobert Loehning <robert.loehning@digia.com>2014-09-02 16:54:54 +0200
commit0f253e48bf0baee099bcec69e58e1ebc83a85b6d (patch)
tree2d9ebd50a9d14bec63da2437a82f682073b9ae38
parente8305e3ed2349b95c7311c296febc6d75f1a0c2a (diff)
downloadqt-creator-0f253e48bf0baee099bcec69e58e1ebc83a85b6d.tar.gz
Squish: Continue testing other files after fatal error
Change-Id: I2e8709a84882dde5a6bc96b4bd213581175c6c8c Reviewed-by: Christian Stenger <christian.stenger@digia.com>
-rw-r--r--tests/system/suite_editors/tst_edit_externally/test.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/system/suite_editors/tst_edit_externally/test.py b/tests/system/suite_editors/tst_edit_externally/test.py
index 6fd8bb8a06..12c7c2487f 100644
--- a/tests/system/suite_editors/tst_edit_externally/test.py
+++ b/tests/system/suite_editors/tst_edit_externally/test.py
@@ -77,7 +77,12 @@ def main():
modifyExternally(files[i - 1])
# clicking Cancel does not work when running inside Squish - mBox would not come up
sendEvent("QCloseEvent", waitForObject(":New_Core::Internal::NewDialog"))
- test.verify(str(waitForObject(mBox).text)
+ try:
+ shownMBox = waitForObject(mBox)
+ except:
+ test.fatal("No MessageBox shown after modifying file %s" % currentFile)
+ continue
+ test.verify(str(shownMBox.text)
in (popupText % os.path.basename(currentFile),
popupText % os.path.basename(files[i - 1])),
"Verifying: One of the modified files is offered as changed.")