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

[Gradle, JS] Add custom log4js appender to KotlinKarma

Browse Source 
#KT-38109 fixed
This commit is contained in:
Ilya Goncharov
2020-04-09 19:44:31 +03:00
parent 005ecc5f29
commit e1793c59be
2 changed files with 11 additions and 14 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/internal/testing/TCServiceMessagesClient.kt
+3 -2
View File
@@ -1,6 +1,6 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle.internal.testing
@@ -85,6 +85,7 @@ internal open class TCServiceMessagesClient(
}
}
is TestSuiteFinished -> close(message.ts, getSuiteName(message))
is Message -> regularText(message.text)
else -> Unit
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
+8 -12
View File
@@ -77,11 +77,14 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
it.appendln(
"""
config.plugins = config.plugins || [];
config.plugins.push('karma-*'); // default
config.plugins.push('kotlin-test-js-runner/karma-kotlin-reporter.js');
config.loggers = config.loggers || [];
config.loggers.push({type: 'kotlin-test-js-runner/tc-log-appender.js'});
config.loggers = [
{
type: 'kotlin-test-js-runner/tc-log-appender.js',
layout: { type: 'pattern', pattern: '%[%d{DATE}:%p [%c]: %]%m' }
}
]
""".trimIndent()
)
}
@@ -448,11 +451,6 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
DEBUG -> log.debug(nonColoredMessage)
}
}
// To provide additional information from Karma
if (SET_ENV_VAR.matches(text.trim())) {
log.error(text)
}
}
private fun processFailedBrowsers(text: String) {
@@ -539,7 +537,5 @@ private const val INFO = "INFO"
private const val DEBUG = "DEBUG"
private const val LOG = "LOG"
private val KARMA_MESSAGE = "(?m)^.*\\d{2} \\d{2} \\d{4,} \\d{2}:\\d{2}:\\d{2}.\\d{3}:($ERROR|$WARN|$INFO|$DEBUG|$LOG) \\[.*]: (.*)\$"
.toRegex()
private val SET_ENV_VAR = "Please, set \"\\w+\" env variable.".toRegex()
private val KARMA_MESSAGE = "^.*\\d{2} \\d{2} \\d{4,} \\d{2}:\\d{2}:\\d{2}.\\d{3}:(ERROR|WARN|INFO|DEBUG|LOG) \\[.*]: ([\\w\\W]*)\$"
.toRegex()