diff options
| author | Robert Loehning <robert.loehning@digia.com> | 2014-09-25 17:54:52 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@digia.com> | 2014-09-26 15:42:30 +0200 |
| commit | bacf4f0afb53b27780df7a529abffbd16a5eeb16 (patch) | |
| tree | e1f45c9bd4cb739d9119594296b689ac2e6384d6 | |
| parent | 9d3ae49e3014ffff59bf174412afaf9c7b800bd5 (diff) | |
| download | qt-creator-bacf4f0afb53b27780df7a529abffbd16a5eeb16.tar.gz | |
Squish: Do not crash tst_simple_debug if debugger can't stop
Change-Id: Iedf0335088739ed60f321b6479711298067f9038
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
| -rw-r--r-- | tests/system/objects.map | 2 | ||||
| -rw-r--r-- | tests/system/suite_debugger/tst_simple_debug/test.py | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/system/objects.map b/tests/system/objects.map index dee62b502f..01ae88f58f 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -47,6 +47,8 @@ :Cannot Open Project.Show Details..._QPushButton {text='Show Details...' type='QPushButton' unnamed='1' visible='1' window=':Cannot Open Project_QMessageBox'} :Cannot Open Project_QMessageBox {text?='Failed to open project in *' type='QMessageBox' unnamed='1' visible='1'} :Cannot Open Project_QTextEdit {type='QTextEdit' unnamed='1' visible='1' window=':Cannot Open Project_QMessageBox'} +:Close Debugging Session.Yes_QPushButton {text='Yes' type='QPushButton' unnamed='1' visible='1' window=':Close Debugging Session_Utils::CheckableMessageBox'} +:Close Debugging Session_Utils::CheckableMessageBox {type='Utils::CheckableMessageBox' unnamed='1' visible='1' windowTitle='Close Debugging Session'} :CodePaster__Internal__PasteSelectDialog.Cancel_QPushButton {text='Cancel' type='QPushButton' unnamed='1' visible='1' window=':CodePaster__Internal__PasteSelectDialog_CodePaster::PasteSelectDialog'} :CodePaster__Internal__PasteSelectDialog.OK_QPushButton {text='OK' type='QPushButton' unnamed='1' visible='1' window=':CodePaster__Internal__PasteSelectDialog_CodePaster::PasteSelectDialog'} :CodePaster__Internal__PasteSelectDialog.listWidget_QListWidget {name='listWidget' type='QListWidget' visible='1' window=':CodePaster__Internal__PasteSelectDialog_CodePaster::PasteSelectDialog'} diff --git a/tests/system/suite_debugger/tst_simple_debug/test.py b/tests/system/suite_debugger/tst_simple_debug/test.py index d7a0f6b5f6..b4cb9ba48d 100644 --- a/tests/system/suite_debugger/tst_simple_debug/test.py +++ b/tests/system/suite_debugger/tst_simple_debug/test.py @@ -84,6 +84,10 @@ def main(): ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton") clickButton(waitForObject("{type='CloseButton' unnamed='1' visible='1' " "window=':Qt Creator_Core::Internal::MainWindow'}")) + try: + clickButton(waitForObject(":Close Debugging Session.Yes_QPushButton", 2000)) + except: + pass if platform.system() == 'Darwin' and JIRA.isBugStillOpen(11595): try: expectedBreakpointsOrder.remove({os.path.join(workingDir, projectName, "main.cpp"):10}) |