From 36525d6534cf0c39c639ace440c2906428cc18f4 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 14 Apr 2020 19:53:43 +0300 Subject: [PATCH] [Gradle, JS] Not all karma messages go through log appenders #KT-38109 fixed --- .../gradle/targets/js/testing/karma/KotlinKarma.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt index bfebc887f40..e165c4c0a56 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt @@ -69,6 +69,8 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : config.reporters.add("karma-kotlin-reporter") confJsWriters.add { + // Not all log events goes through this appender + // For example Error in config file //language=ES6 it.appendln( """ @@ -78,7 +80,8 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : config.loggers = [ { 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() @@ -445,8 +448,9 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : val launcherMessage = KARMA_MESSAGE.matchEntire(text) val actualText = if (launcherMessage != null) { - val (_, message) = launcherMessage.destructured - when (actualType?.toLowerCase()) { + val (logLevel, message) = launcherMessage.destructured + actualType = logLevel.toLowerCase() + when (actualType) { WARN, ERROR -> { processFailedBrowsers(text) }