diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-06-01 12:30:28 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-06-01 12:30:28 +0200 |
| commit | c065ea93269f16b7a5ef5ea5b253f39deff474b1 (patch) | |
| tree | 7903f603840642c5dd17ee21d06d50a33ec9e3c6 /tests | |
| parent | d7b8dcc684f8808e573aabd890caf6eea307d7c8 (diff) | |
| parent | 1ddfb443b686ef04cc0e28363308ce70d01f0d73 (diff) | |
Merge branch '4.6' into 4.7
Change-Id: Ieddac600af64f3b278340c4e3555cee0f4190bcf
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/system/suite_tools/tst_codepasting/test.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/system/suite_tools/tst_codepasting/test.py b/tests/system/suite_tools/tst_codepasting/test.py index ed9c405220..023d785312 100644 --- a/tests/system/suite_tools/tst_codepasting/test.py +++ b/tests/system/suite_tools/tst_codepasting/test.py @@ -155,7 +155,7 @@ def main(): skippedPasting = True description = "Paste from 2017-05-11" if protocol == NAME_KDE: - pasteId = "pyy2xvjh7" # valid for one year + pasteId = "pysjk6n2i" pastedText = readFile(os.path.join(os.getcwd(), "testdata", "main-prepasted.cpp")) elif skipPastingToPastebinCom and protocol == NAME_PBCOM: pasteId = "8XHP0ZgH" @@ -186,7 +186,7 @@ def main(): clickButton(waitForObject(":*Qt Creator.Clear_QToolButton")) continue test.compare(filenameCombo.currentText, "%s: %s" % (protocol, pasteId), "Verify title of editor") - if protocol == NAME_PBCOM and pastedText.endswith("\n"): + if protocol in (NAME_KDE, NAME_PBCOM) and pastedText.endswith("\n"): pastedText = pastedText[:-1] test.compare(editor.plainText, pastedText, "Verify that pasted and fetched texts are the same") invokeMenuItem("File", "Close All") |