From 96a9b2bb5b6ecb66eade04115f58b0ee55921523 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 22 Aug 2016 18:21:05 +0200 Subject: [PATCH] Squish: Strip final newline from expected text Change-Id: Icc10f3f0efad5a5d803f556037ecbc08fb6503f1 Reviewed-by: Christian Stenger --- tests/system/suite_tools/tst_codepasting/test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/system/suite_tools/tst_codepasting/test.py b/tests/system/suite_tools/tst_codepasting/test.py index e05ebe2603a..5a5c16dfa53 100644 --- a/tests/system/suite_tools/tst_codepasting/test.py +++ b/tests/system/suite_tools/tst_codepasting/test.py @@ -58,7 +58,7 @@ def main(): description = "Description %s" % datetime.utcnow() type(waitForObject(":uiDescription_QLineEdit"), description) typeLines(pasteEditor, "// tst_codepasting %s" % datetime.utcnow()) - pastedText = pasteEditor.plainText + pastedText = str(pasteEditor.plainText) expiry = waitForObject(":Send to Codepaster.qt_spinbox_lineedit_QLineEdit") expiryDays = random.randint(1, 10) replaceEditorContent(expiry, "%d" % expiryDays) @@ -134,6 +134,8 @@ def main(): waitFor("not filenameCombo.currentText.isEmpty()", 20000) editor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget") test.compare(filenameCombo.currentText, "%s: %s" % (protocol, pasteId), "Verify title of editor") + if protocol == "Pastebin.Com" 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") invokeMenuItem("File", "Open File or Project...")