diff options
| author | Robert Loehning <robert.loehning@theqtcompany.com> | 2016-02-08 14:34:15 +0100 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@theqtcompany.com> | 2016-02-15 10:40:54 +0000 |
| commit | 6f7c4249ad087316f71566e10716c1f99d3fde56 (patch) | |
| tree | e32ae9bb139069fe95d5a60fa40859fdc9f625de | |
| parent | b7ee61d389bd32e3b8b1acf75d97aca056fde3b0 (diff) | |
| download | qt-creator-6f7c4249ad087316f71566e10716c1f99d3fde56.tar.gz | |
Squish: Stabilize tst_CSUP06
Change-Id: I52f4c858f178cb3018e57461e2350564fbf78024
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
| -rw-r--r-- | tests/system/suite_CSUP/tst_CSUP06/test.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/system/suite_CSUP/tst_CSUP06/test.py b/tests/system/suite_CSUP/tst_CSUP06/test.py index b36adb57fd..28a55e32b0 100644 --- a/tests/system/suite_CSUP/tst_CSUP06/test.py +++ b/tests/system/suite_CSUP/tst_CSUP06/test.py @@ -128,7 +128,10 @@ def checkSymbolCompletion(editor, isClangCodeModel): def testSymb(currentLine, *args): missing, expectedSug, expectedRes = args symbol = currentLine.lstrip("/").strip() - propShown = waitFor("object.exists(':popupFrame_TextEditor::GenericProposalWidget')", 2500) + 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) found = [] @@ -149,8 +152,11 @@ def checkSymbolCompletion(editor, isClangCodeModel): else: exp = (symbol[:max(symbol.rfind(":"), symbol.rfind(".")) + 1] + expectedSug.get(symbol, found)[0]) - if not (isClangCodeModel and platform.system() in ('Microsoft', 'Windows') - and JIRA.isBugStillOpen(15483)): + if isClangCodeModel and changedLine != exp and JIRA.isBugStillOpen(15483): + test.xcompare(changedLine, exp, "Verify completion matches (QTCREATORBUG-15483).") + test.verify(changedLine.startswith(exp.replace("(", "").replace(")", "")), + "Verify completion starts with expected string.") + else: test.compare(changedLine, exp, "Verify completion matches.") performAutoCompletionTest(editor, ".*Complete symbols.*", "//", |