Commit 7ba42ec9 authored by Robert Loehning's avatar Robert Loehning

Squish: Update workarounds for Clang Code Model

Change-Id: Ib7f5bb5670ff393f2b3bbecb1398bf382d6cca66
Reviewed-by: default avatarRobert Loehning <robert.loehning@qt.io>
parent 50552a28
...@@ -76,8 +76,6 @@ def main(): ...@@ -76,8 +76,6 @@ def main():
"possible to select one of the suggestions.") "possible to select one of the suggestions.")
# Step 4: Insert text "voi" to new line and press Tab. # Step 4: Insert text "voi" to new line and press Tab.
resetLine(editorWidget) resetLine(editorWidget)
if useClang and JIRA.isBugStillOpen(15639):
snooze(2)
type(editorWidget, "voi") type(editorWidget, "voi")
try: try:
waitForObjectItem(":popupFrame_Proposal_QListView", "void") waitForObjectItem(":popupFrame_Proposal_QListView", "void")
......
...@@ -48,8 +48,8 @@ def main(): ...@@ -48,8 +48,8 @@ def main():
type(editorWidget, "<Return>") type(editorWidget, "<Return>")
type(editorWidget, "<Up>") type(editorWidget, "<Up>")
type(editorWidget, "class") type(editorWidget, "class")
if useClang and JIRA.isBugStillOpen(15639): if useClang and JIRA.isBugStillOpen(18769):
snooze(8) snooze(4)
if platform.system() == "Darwin": if platform.system() == "Darwin":
type(editorWidget, "<Meta+Space>") type(editorWidget, "<Meta+Space>")
else: else:
......
...@@ -124,8 +124,6 @@ def checkSymbolCompletion(editor, isClangCodeModel): ...@@ -124,8 +124,6 @@ def checkSymbolCompletion(editor, isClangCodeModel):
missing, expectedSug, expectedRes = args missing, expectedSug, expectedRes = args
symbol = currentLine.lstrip("/").strip() symbol = currentLine.lstrip("/").strip()
timeout = 2500 timeout = 2500
if isClangCodeModel and JIRA.isBugStillOpen(15639):
timeout = 5000
propShown = waitFor("object.exists(':popupFrame_TextEditor::GenericProposalWidget')", timeout) propShown = waitFor("object.exists(':popupFrame_TextEditor::GenericProposalWidget')", timeout)
test.compare(not propShown, symbol in missing, test.compare(not propShown, symbol in missing,
"Proposal widget is (not) shown as expected (%s)" % symbol) "Proposal widget is (not) shown as expected (%s)" % symbol)
......
...@@ -43,8 +43,6 @@ def main(): ...@@ -43,8 +43,6 @@ def main():
typeLines(cppwindow, ("<Up>", testData.field(record, "declaration"))) typeLines(cppwindow, ("<Up>", testData.field(record, "declaration")))
type(cppwindow, testData.field(record, "usage")) type(cppwindow, testData.field(record, "usage"))
snooze(1) # maybe find something better snooze(1) # maybe find something better
if useClang and JIRA.isBugStillOpen(15639):
snooze(1)
type(cppwindow, testData.field(record, "operator")) type(cppwindow, testData.field(record, "operator"))
waitFor("object.exists(':popupFrame_TextEditor::GenericProposalWidget')", 1500) waitFor("object.exists(':popupFrame_TextEditor::GenericProposalWidget')", 1500)
found = str(lineUnderCursor(cppwindow)).strip() found = str(lineUnderCursor(cppwindow)).strip()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment