diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-12-02 22:07:22 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-12-03 09:56:07 +0200 |
| commit | 7096649fc267e3b12989f723d4e5cb7ae7b7c958 (patch) | |
| tree | 3e689cae9d803037fa744c0655389486cb6b05b1 /tests | |
| parent | c9a48ad5b1e1eae4d9162ea0158b18ac1ed592e7 (diff) | |
| parent | f0226d9644e7936cc12109448490047ae52bc320 (diff) | |
Merge remote-tracking branch 'origin/4.8'
Change-Id: I5b18233936e3b2cd674df92a694ba73b5a3ed752
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/system/suite_WELP/tst_WELP01/test.py | 2 | ||||
| -rw-r--r-- | tests/system/suite_WELP/tst_WELP04/test.py | 4 | ||||
| -rw-r--r-- | tests/system/suite_qtquick/tst_qml_outline/test.py | 8 |
3 files changed, 10 insertions, 4 deletions
diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py index 49c5876d94..ce07f4fdaf 100755 --- a/tests/system/suite_WELP/tst_WELP01/test.py +++ b/tests/system/suite_WELP/tst_WELP01/test.py @@ -156,7 +156,7 @@ def main(): for (qType, prop, info) in expect: test.verify(checkIfObjectExists(search % (qType, prop)), "Verifying whether %s is shown" % info) - checkTableViewForContent(search % (expect[0][0], expect[0][1]), "Help: Create .*", "Tutorials", + checkTableViewForContent(search % (expect[0][0], expect[0][1]), "Help: Creating .*", "Tutorials", "Verifying that at least one tutorial is displayed.") # exit Qt Creator invokeMenuItem("File", "Exit") diff --git a/tests/system/suite_WELP/tst_WELP04/test.py b/tests/system/suite_WELP/tst_WELP04/test.py index 27e3f5d007..f66efba6c5 100644 --- a/tests/system/suite_WELP/tst_WELP04/test.py +++ b/tests/system/suite_WELP/tst_WELP04/test.py @@ -50,11 +50,13 @@ def main(): tutorial = findExampleOrTutorial(tableView, ".*", True) test.verify(tutorial is None, "Verifying: 'Tutorials' topic is opened and nothing is shown.") - bnr = "Help: Build and Run Examples" + bnr = "Help: Building and Running an Example" replaceEditorContent(searchTutorials, bnr.lower()) waitFor('findExampleOrTutorial(tableView, "%s.*") is not None' % bnr, 3000) tutorial = findExampleOrTutorial(tableView, "%s.*" % bnr, True) test.verify(tutorial is not None, "Verifying: Expected Text tutorial is shown.") + # clicking before documentation was updated will open the tutorial in browser + progressBarWait(warn=False) # select a text tutorial mouseClick(tutorial) test.verify("Building and Running an Example" in diff --git a/tests/system/suite_qtquick/tst_qml_outline/test.py b/tests/system/suite_qtquick/tst_qml_outline/test.py index b55cfaf367..4c0c5e8a03 100644 --- a/tests/system/suite_qtquick/tst_qml_outline/test.py +++ b/tests/system/suite_qtquick/tst_qml_outline/test.py @@ -140,8 +140,12 @@ def verifyOutline(outlinePseudoTree, datasetFileName): return for counter, (expectedItem, foundItem) in enumerate(zip(expected, outlinePseudoTree)): if expectedItem != foundItem: - test.fail("Mismatch in element number %d for '%s'" % (counter + 1, fileName), - "%s != %s" % (str(expectedItem), str(foundItem))) + if JIRA.isBugStillOpen(21335) and expectedItem[:-1] == foundItem[:-1]: + test.xfail("Mismatch in element number %d for '%s'" % (counter + 1, fileName), + "%s != %s" % (str(expectedItem), str(foundItem))) + else: + test.fail("Mismatch in element number %d for '%s'" % (counter + 1, fileName), + "%s != %s" % (str(expectedItem), str(foundItem))) return test.passes("All nodes (%d) inside outline match expected nodes for '%s'." % (len(expected), fileName)) |