diff options
| author | Christian Stenger <christian.stenger@digia.com> | 2014-01-14 16:31:09 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@digia.com> | 2014-01-14 16:45:31 +0100 |
| commit | bb0c02a0f931aaf5969d3762e866922a445fc226 (patch) | |
| tree | b0efc37f735d3554745422ba9a76997a8af7bce0 /tests | |
| parent | 597258c03eac1f2f26876e79c9ba5dfda3f70d6b (diff) | |
| download | qt-creator-bb0c02a0f931aaf5969d3762e866922a445fc226.tar.gz | |
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: Robert Loehning <robert.loehning@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/system/suite_tools/tst_git_clone/test.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/system/suite_tools/tst_git_clone/test.py b/tests/system/suite_tools/tst_git_clone/test.py index 656b29863e..a7f5a5dde8 100644 --- a/tests/system/suite_tools/tst_git_clone/test.py +++ b/tests/system/suite_tools/tst_git_clone/test.py @@ -53,9 +53,11 @@ def verifyCloneLog(targetDir, canceled): "Searching for clone directory in clone log") result = "The process terminated with exit code 0." 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)), "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) def verifyFiles(targetDir): |