summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@qt.io>2017-08-18 18:05:22 +0200
committerRobert Loehning <robert.loehning@qt.io>2017-08-21 10:43:03 +0000
commit7ba42ec95a76bf2fb912ee4f158aeb3ac82f19e7 (patch)
tree6a7f0b9f0f461c08b3aeb486da841fc2f630f2ab /tests
parent50552a28fa1f58982edef5a3524a1ad406999eff (diff)
downloadqt-creator-7ba42ec95a76bf2fb912ee4f158aeb3ac82f19e7.tar.gz
Squish: Update workarounds for Clang Code Model
Change-Id: Ib7f5bb5670ff393f2b3bbecb1398bf382d6cca66 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/system/suite_CSUP/tst_CSUP01/test.py2
-rw-r--r--tests/system/suite_CSUP/tst_CSUP02/test.py4
-rw-r--r--tests/system/suite_CSUP/tst_CSUP06/test.py2
-rw-r--r--tests/system/suite_editors/tst_memberoperator/test.py2
4 files changed, 2 insertions, 8 deletions
diff --git a/tests/system/suite_CSUP/tst_CSUP01/test.py b/tests/system/suite_CSUP/tst_CSUP01/test.py
index c8c7064a39..5463bd4248 100644
--- a/tests/system/suite_CSUP/tst_CSUP01/test.py
+++ b/tests/system/suite_CSUP/tst_CSUP01/test.py
@@ -76,8 +76,6 @@ def main():
"possible to select one of the suggestions.")
# Step 4: Insert text "voi" to new line and press Tab.
resetLine(editorWidget)
- if useClang and JIRA.isBugStillOpen(15639):
- snooze(2)
type(editorWidget, "voi")
try:
waitForObjectItem(":popupFrame_Proposal_QListView", "void")
diff --git a/tests/system/suite_CSUP/tst_CSUP02/test.py b/tests/system/suite_CSUP/tst_CSUP02/test.py
index aacd96a13d..f6563d0b7f 100644
--- a/tests/system/suite_CSUP/tst_CSUP02/test.py
+++ b/tests/system/suite_CSUP/tst_CSUP02/test.py
@@ -48,8 +48,8 @@ def main():
type(editorWidget, "<Return>")
type(editorWidget, "<Up>")
type(editorWidget, "class")
- if useClang and JIRA.isBugStillOpen(15639):
- snooze(8)
+ if useClang and JIRA.isBugStillOpen(18769):
+ snooze(4)
if platform.system() == "Darwin":
type(editorWidget, "<Meta+Space>")
else:
diff --git a/tests/system/suite_CSUP/tst_CSUP06/test.py b/tests/system/suite_CSUP/tst_CSUP06/test.py
index 7d2a31c39a..2ab54ca4bf 100644
--- a/tests/system/suite_CSUP/tst_CSUP06/test.py
+++ b/tests/system/suite_CSUP/tst_CSUP06/test.py
@@ -124,8 +124,6 @@ def checkSymbolCompletion(editor, isClangCodeModel):
missing, expectedSug, expectedRes = args
symbol = currentLine.lstrip("/").strip()
timeout = 2500
- if isClangCodeModel and JIRA.isBugStillOpen(15639):
- timeout = 5000
propShown = waitFor("object.exists(':popupFrame_TextEditor::GenericProposalWidget')", timeout)
test.compare(not propShown, symbol in missing,
"Proposal widget is (not) shown as expected (%s)" % symbol)
diff --git a/tests/system/suite_editors/tst_memberoperator/test.py b/tests/system/suite_editors/tst_memberoperator/test.py
index 4582268c70..7efeb4e91f 100644
--- a/tests/system/suite_editors/tst_memberoperator/test.py
+++ b/tests/system/suite_editors/tst_memberoperator/test.py
@@ -43,8 +43,6 @@ def main():
typeLines(cppwindow, ("<Up>", testData.field(record, "declaration")))
type(cppwindow, testData.field(record, "usage"))
snooze(1) # maybe find something better
- if useClang and JIRA.isBugStillOpen(15639):
- snooze(1)
type(cppwindow, testData.field(record, "operator"))
waitFor("object.exists(':popupFrame_TextEditor::GenericProposalWidget')", 1500)
found = str(lineUnderCursor(cppwindow)).strip()