summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@qt.io>2020-02-21 15:17:04 +0100
committerRobert Loehning <robert.loehning@qt.io>2020-02-26 11:07:56 +0000
commit29ab2d3644c128362b19e3a33ddde05c50d75f88 (patch)
treed2f31ea777ecb06cb1ea0cb762dd37e8f135df10 /tests
parentf15d6d0bafeb2d5be6c564413f9fd51827221af0 (diff)
downloadqt-creator-29ab2d3644c128362b19e3a33ddde05c50d75f88.tar.gz
Squish: Break endless loop in tst_CSUP06
Change-Id: Id0762128a9c2b6b3cc15684ff1b35c38b3a64c97 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/system/objects.map1
-rw-r--r--tests/system/suite_CSUP/tst_CSUP06/test.py4
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/system/objects.map b/tests/system/objects.map
index 1144af6ce2..b5d903b7bd 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -196,6 +196,7 @@
:Session Manager_ProjectExplorer::Internal::SessionDialog {name='ProjectExplorer__Internal__SessionDialog' type='ProjectExplorer::Internal::SessionDialog' visible='1' windowTitle='Session Manager'}
:Startup.contextHelpComboBox_QComboBox {container=':Form.Startup_QGroupBox' name='contextHelpComboBox' type='QComboBox' visible='1'}
:User Interface.languageBox_QComboBox {container=':Core__Internal__GeneralSettings.User Interface_QGroupBox' name='languageBox' type='QComboBox' visible='1'}
+:Utils::FakeToolTip {type='Utils::FakeToolTip' unnamed='1' visible='1'}
:Widget Box_qdesigner_internal::WidgetBoxTreeWidget {container=':*Qt Creator.Widget Box_QDockWidget' type='qdesigner_internal::WidgetBoxTreeWidget' unnamed='1' visible='1'}
:Working Copy_Utils::BaseValidatingLineEdit {type='Utils::FancyLineEdit' unnamed='1' visible='1' window=':New_ProjectExplorer::JsonWizard'}
:WritePermissions_Core::Internal::ReadOnlyFilesDialog {name='Core__Internal__ReadOnlyFilesDialog' type='Core::ReadOnlyFilesDialog' visible='1' windowTitle='Files Without Write Permissions'}
diff --git a/tests/system/suite_CSUP/tst_CSUP06/test.py b/tests/system/suite_CSUP/tst_CSUP06/test.py
index 9e094b0a0d..3626a95951 100644
--- a/tests/system/suite_CSUP/tst_CSUP06/test.py
+++ b/tests/system/suite_CSUP/tst_CSUP06/test.py
@@ -28,7 +28,9 @@ source("../../shared/qtcreator.py")
def moveDownToNextNonEmptyLine(editor):
currentLine = "" # there's no do-while in python - so use empty line which fails
while not currentLine:
- type(editor, "<Down>")
+ if waitFor("object.exists(':Utils::FakeToolTip')", 100):
+ type(editor, "<Esc>") # close possibly shown completion tooltip so pressing
+ type(editor, "<Down>") # down scrolls the line, not completion alternatives
currentLine = str(lineUnderCursor(editor)).strip()
return currentLine