feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Strip final newline from expected text

Browse Source 
Change-Id: Icc10f3f0efad5a5d803f556037ecbc08fb6503f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2016-08-22 18:21:05 +02:00
parent 1074b08176
commit 96a9b2bb5b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/system/suite_tools/tst_codepasting/test.py
View File

@@ -58,7 +58,7 @@ def main():
description = "Description %s" % datetime.utcnow() description = "Description %s" % datetime.utcnow()
type(waitForObject(":uiDescription_QLineEdit"), description) type(waitForObject(":uiDescription_QLineEdit"), description)
typeLines(pasteEditor, "// tst_codepasting %s" % datetime.utcnow()) typeLines(pasteEditor, "// tst_codepasting %s" % datetime.utcnow())
pastedText = pasteEditor.plainText pastedText = str(pasteEditor.plainText)
expiry = waitForObject(":Send to Codepaster.qt_spinbox_lineedit_QLineEdit") expiry = waitForObject(":Send to Codepaster.qt_spinbox_lineedit_QLineEdit")
expiryDays = random.randint(1, 10) expiryDays = random.randint(1, 10)
replaceEditorContent(expiry, "%d" % expiryDays) replaceEditorContent(expiry, "%d" % expiryDays)
@@ -134,6 +134,8 @@ def main():
waitFor("not filenameCombo.currentText.isEmpty()", 20000) waitFor("not filenameCombo.currentText.isEmpty()", 20000)
editor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget") editor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
test.compare(filenameCombo.currentText, "%s: %s" % (protocol, pasteId), "Verify title of editor") 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") test.compare(editor.plainText, pastedText, "Verify that pasted and fetched texts are the same")
invokeMenuItem("File", "Close All") invokeMenuItem("File", "Close All")
invokeMenuItem("File", "Open File or Project...") invokeMenuItem("File", "Open File or Project...")