From 70f6ad7691f33a2523c71c69baae547d4fe39d50 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Thu, 9 Apr 2020 21:02:45 +0300
Subject: [PATCH] [Gradle, JS] All karma output to debug

#KT-38109 fixed
---
 .../targets/js/testing/JSServiceMessages.kt    | 18 ++++++------------
 .../targets/js/testing/karma/KotlinKarma.kt    |  8 ++------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/JSServiceMessages.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/JSServiceMessages.kt
index a6d06bf5bf8..cf501864696 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/JSServiceMessages.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/JSServiceMessages.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * 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.
  */
 
@@ -23,18 +23,11 @@ internal open class JSServiceMessagesTestExecutionSpec(
     checkExitCode,
     clientSettings
 ) {
-    protected val suppressedOutput = StringBuilder()
-
-    override fun showSuppressedOutput() {
-        println(suppressedOutput)
-    }
-
     override fun createClient(testResultProcessor: TestResultProcessor, log: Logger): TCServiceMessagesClient {
         return JSServiceMessagesClient(
             results = testResultProcessor,
             settings = clientSettings,
-            log = log,
-            suppressedOutput = suppressedOutput
+            log = log
         )
     }
 }
@@ -42,10 +35,11 @@ internal open class JSServiceMessagesTestExecutionSpec(
 internal open class JSServiceMessagesClient(
     results: TestResultProcessor,
     settings: TCServiceMessagesClientSettings,
-    log: Logger,
-    private val suppressedOutput: StringBuilder
+    log: Logger
 ) : TCServiceMessagesClient(results, settings, log) {
     override fun printNonTestOutput(text: String) {
-        suppressedOutput.appendln(text)
+        if (log.isDebugEnabled) {
+            log.debug(text)
+        }
     }
 }
\ No newline at end of file
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 6a1c0ef7f61..a9d5a6dcfc2 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
@@ -411,8 +411,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
                 object : JSServiceMessagesClient(
                     testResultProcessor,
                     clientSettings,
-                    log,
-                    suppressedOutput
+                    log
                 ) {
                     val baseTestNameSuffix get() = settings.testNameSuffix
                     override var testNameSuffix: String? = baseTestNameSuffix
@@ -424,10 +423,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) :
                         progressLogger.progress(value)
 
                         parseConsole(value)
-
-                        if (log.isDebugEnabled) {
-                            super.printNonTestOutput(text)
-                        }
+                        super.printNonTestOutput(text)
                     }
 
                     private fun parseConsole(text: String) {