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

[Gradle, JS] Not all karma messages go through log appenders

Browse Source 
#KT-38109 fixed
This commit is contained in:
Ilya Goncharov
2020-04-14 19:53:43 +03:00
parent 480a9c16fb
commit 36525d6534
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
+7 -3
View File
@@ -69,6 +69,8 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
config.reporters.add("karma-kotlin-reporter") config.reporters.add("karma-kotlin-reporter")
confJsWriters.add { confJsWriters.add {
// Not all log events goes through this appender
// For example Error in config file
//language=ES6 //language=ES6
it.appendln( it.appendln(
""" """
@@ -78,7 +80,8 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
config.loggers = [ config.loggers = [
{ {
type: 'kotlin-test-js-runner/tc-log-appender.js', type: 'kotlin-test-js-runner/tc-log-appender.js',
layout: { type: 'pattern', pattern: '%[[%c]: %]%m' } //default layout
layout: { type: 'pattern', pattern: '%[%d{DATE}:%p [%c]: %]%m' }
} }
] ]
""".trimIndent() """.trimIndent()
@@ -445,8 +448,9 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
val launcherMessage = KARMA_MESSAGE.matchEntire(text) val launcherMessage = KARMA_MESSAGE.matchEntire(text)
val actualText = if (launcherMessage != null) { val actualText = if (launcherMessage != null) {
val (_, message) = launcherMessage.destructured val (logLevel, message) = launcherMessage.destructured
when (actualType?.toLowerCase()) { actualType = logLevel.toLowerCase()
when (actualType) {
WARN, ERROR -> { WARN, ERROR -> {
processFailedBrowsers(text) processFailedBrowsers(text)
} }