azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reporting: TC integration escaping issues fix.

Browse Source 
- error: testFailed ignored if message or details isn't correctly escaped
- fail: testFailed's message should be escaped also.
This commit is contained in:
Vasily Levchenko
2017-02-21 15:42:50 +03:00
committed by vvlevchenko
parent e59f3c0805
commit f372ddea4d
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+17 -13
View File
@@ -439,29 +439,33 @@ fun main(args : Array<String>) {
return super.pass()
}
/**
* Teamcity require escaping some symbols in pipe manner.
* https://github.com/GitTools/GitVersion/issues/94
*/
String toTeamCityFormat(String inStr) {
return inStr.replaceAll("\\|", "||")
.replaceAll("\r", "|r")
.replaceAll("\n", "|n")
.replaceAll("'", "|'")
.replaceAll("\\[", "|[")
.replaceAll("]", "|]")
}
TestResult fail(TestFailedException e) {
teamcityReport("testFailed type='comparisonFailure' name='$name' message='${e.getMessage()}'")
teamcityReport("testFailed type='comparisonFailure' name='$name' message='${toTeamCityFormat(e.getMessage())}'")
teamcityFinish()
return super.fail(e)
}
TestResult error(Exception e) {
def writer = new StringWriter()
e.printStackTrace(new PrintWriter(writer))
def rawString = writer.toString()
/**
* Teamcity require escaping some symbols in pipe manner.
* https://github.com/GitTools/GitVersion/issues/94
*/
def formatedString = rawString
.replaceAll("\\|", "||")
.replaceAll("\r", "|r")
.replaceAll("\n", "|n")
.replaceAll("'", "|'")
.replaceAll("\\[", "|[")
.replaceAll("]", "|]")
teamcityReport("testFailed name='$name' message='${e.getMessage()}' details='${formatedString}'")
teamcityReport("testFailed name='$name' message='${toTeamCityFormat(e.getMessage())}' details='${toTeamCityFormat(rawString)}'")
teamcityFinish()
return super.error(e)
}