From bfd8c5d9eeeb2c0a1941825976442d724c9e0a9b Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Tue, 11 Jun 2019 18:14:07 +0200 Subject: [PATCH] Squish: Update tst_HELP04 Task-number: QTBUG-67737 Change-Id: I4808ddccbe4e83d42d24f17a80485b5464822825 Reviewed-by: Christian Stenger --- tests/system/suite_HELP/tst_HELP04/test.py | 9 +++++---- 1 file 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 1626e5d9b8d..8a3049c173a 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, "") 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)