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

FIR IDE: fix test infra swallowing test failure output

Browse Source
This commit is contained in:
Tianyu Geng
2021-06-11 11:54:07 -07:00
committed by TeamCityServer
parent 22fbd2044c
commit 8d69f32d04
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/utils/IgnoreTests.kt
+6 -1
View File
@@ -9,6 +9,7 @@ import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.KtAssert import org.jetbrains.kotlin.test.KtAssert
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
import org.slf4j.LoggerFactory
import java.io.File import java.io.File
import java.nio.file.Files import java.nio.file.Files
import java.nio.file.Path import java.nio.file.Path
@@ -98,7 +99,11 @@ object IgnoreTests {
} catch (e: Throwable) { } catch (e: Throwable) {
if (testIsEnabled) { if (testIsEnabled) {
if (directive is EnableOrDisableTestDirective.Disable) { if (directive is EnableOrDisableTestDirective.Disable) {
handleTestWithWrongDirective(testPasses = false, testFile, directive, directivePosition, additionalFiles) try {
handleTestWithWrongDirective(testPasses = false, testFile, directive, directivePosition, additionalFiles)
} catch (e: AssertionError) {
LoggerFactory.getLogger("test").info(e.message)
}
} }
throw e throw e
} }