From 54d5059ec02f6dd20e2701d0f51865239b13f832 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 16 Nov 2011 09:30:51 +0100 Subject: [PATCH] Squish: Small fix and improvement for indent test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib34050986433bf9010da2e8cf71fe6651559c015 Reviewed-by: Bill King Reviewed-by: Robert Löhning --- tests/system/suite_qtquick/tst_qml_indent/test.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/system/suite_qtquick/tst_qml_indent/test.py b/tests/system/suite_qtquick/tst_qml_indent/test.py index ef7a8a0cec3..1fd686bb33c 100644 --- a/tests/system/suite_qtquick/tst_qml_indent/test.py +++ b/tests/system/suite_qtquick/tst_qml_indent/test.py @@ -43,11 +43,10 @@ def prepareQmlFile(): originalText = "%s" % editor.plainText indented = editor.plainText unindented = "" - lines = str(indented).split("\n") + lines = str(indented).splitlines() test.log("Using %d lines..." % len(lines)) for line in lines: unindented += line.lstrip()+"\n" - unindented=unindented[0:-1] editor.plainText = unindented return True @@ -63,11 +62,13 @@ def testReIndent(): "window=':Qt Creator_Core::Internal::MainWindow'}") type(editor, "") test.log("calling re-indent") + starttime = datetime.utcnow() type(editor, "") - waitFor("textHasChanged==True", 20000) + waitFor("textHasChanged==True", 25000) + endtime = datetime.utcnow() textAfterReIndent = "%s" % editor.plainText if originalText==textAfterReIndent: - test.passes("Text successfully reindented...") + test.passes("Text successfully re-indented within %d seconds" % (endtime-starttime).seconds) else: # shrink the texts - it's huge output that takes long time to finish & screenshot is taken as well originalText = shrinkText(originalText, 20)