diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-06-13 13:53:02 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-13 13:53:02 +0200 |
| commit | 39477594da1abbfde88f822ba847303df2bcc766 (patch) | |
| tree | 65acdb05693909e33ace70ba1b0575b308fe6259 /tests | |
| parent | 58451e630df822f299e5e222957f954d57b1fc74 (diff) | |
| parent | 66dc83139821a978cf889ffb3a33a3f0fb11e6b0 (diff) | |
Merge remote-tracking branch 'gerrit/4.9' into 4.10
Change-Id: I033d6baa40af45ae1eb6ed82827ff51213c832f5
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/system/suite_HELP/tst_HELP04/test.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/system/suite_HELP/tst_HELP04/test.py b/tests/system/suite_HELP/tst_HELP04/test.py index 1626e5d9b8..8a3049c173 100644 --- a/tests/system/suite_HELP/tst_HELP04/test.py +++ b/tests/system/suite_HELP/tst_HELP04/test.py @@ -26,7 +26,7 @@ source("../../shared/qtcreator.py") # test search in help mode and advanced search -searchKeywordDictionary={ "abundance":True, "deplmint":False, "QODBC":True, "bld":False } +searchKeywordDictionary = { "abundance":True, "deplmint":False, "QODBC":True, "bldx":False } urlDictionary = { "abundance":"qthelp://com.trolltech.qt.487/qdoc/gettingstarted-develop.html", "QODBC":"qthelp://com.trolltech.qt.487/qdoc/sql-driver.html" } @@ -93,7 +93,7 @@ def main(): clickButton(waitForObject("{text='Search' type='QPushButton' unnamed='1' visible='1' " "window=':Qt Creator_Core::Internal::MainWindow'}")) resultWidget = waitForObject(':Hits_QResultWidget', 5000) - if not JIRA.isBugStillOpen(67737, JIRA.Bug.QT): + if os.getenv("SYSTEST_BUILT_WITH_QT_5_13_1_OR_NEWER", "0") == "1": test.verify(waitFor("noMatch in " "str(resultWidget.plainText)", 2000), "Verifying if search did not match anything.") @@ -121,9 +121,10 @@ def main(): type(resultWidget, "<Return>") waitFor("__getUrl__() != url or selText != __getSelectedText__()", 20000) verifySelection(searchKeyword) - verifyUrl(urlDictionary[searchKeyword]) + if not (searchKeyword == "QODBC" and JIRA.isBugStillOpen(10331)): + verifyUrl(urlDictionary[searchKeyword]) else: - if not JIRA.isBugStillOpen(67737, JIRA.Bug.QT): + if os.getenv("SYSTEST_BUILT_WITH_QT_5_13_1_OR_NEWER", "0") == "1": test.verify(waitFor("noMatch in " "str(resultWidget.plainText)", 1000), "Verifying if search did not match anything for: " + searchKeyword) |