Commit bb0c02a0 authored by Christian Stenger's avatar Christian Stenger
Browse files

Squish: Fix logged output of tst_git_clone



The clone log contains escape as a character (unicode 0x1b) which
makes the creation of the results.xml fail. This patch removes these
for unquoted text logs.

Change-Id: Ia5312c4cf41dbf9c40732e48ebe4694f79f39bb2
Reviewed-by: default avatarRobert Loehning <robert.loehning@digia.com>
parent 597258c0
...@@ -53,9 +53,11 @@ def verifyCloneLog(targetDir, canceled): ...@@ -53,9 +53,11 @@ def verifyCloneLog(targetDir, canceled):
"Searching for clone directory in clone log") "Searching for clone directory in clone log")
result = "The process terminated with exit code 0." result = "The process terminated with exit code 0."
summary = "Succeeded." summary = "Succeeded."
# cloneLog.plainText holds escape as character which makes QDom fail while printing the result
# removing these for letting Jenkins continue execute the test suite
test.xverify((result in str(cloneLog.plainText)), test.xverify((result in str(cloneLog.plainText)),
"Searching for result (%s) in clone log:\n%s" "Searching for result (%s) in clone log:\n%s"
% (result, str(cloneLog.plainText))) % (result, str(cloneLog.plainText).replace(unicode("\x1b"), "")))
test.compare(waitForObject(":Git Repository Clone.Result._QLabel").text, summary) test.compare(waitForObject(":Git Repository Clone.Result._QLabel").text, summary)
def verifyFiles(targetDir): def verifyFiles(targetDir):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment