From d87d42348beb4223e953e7a2765d8674d52a00f2 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 19 Aug 2020 18:42:37 +0300 Subject: [PATCH] Mute flaky GotoWithMultipleLibrariesTest Tests are flaky after https://github.com/JetBrains/kotlin/commit/e2a12602a3e8fa8e4425282d924db0fa29195873 --- .../jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt | 7 +++++++ tests/mute-common.csv | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt index 95ea0573d43..56023fd85d5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt @@ -34,9 +34,12 @@ import org.jetbrains.kotlin.idea.test.* import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest +import org.jetbrains.kotlin.test.runTest import org.junit.Assert import java.io.File +@WithMutedInDatabaseRunTest abstract class AbstractMultiModuleTest : DaemonAnalyzerTestCase() { abstract override fun getTestDataPath(): String @@ -73,6 +76,10 @@ abstract class AbstractMultiModuleTest : DaemonAnalyzerTestCase() { return super.createModule(path, moduleType) } + override fun runTest() { + runTest { super.runTest() } + } + fun addRoot(module: Module, sourceDirInTestData: File, isTestRoot: Boolean, transformContainedFiles: ((File) -> Unit)? = null) { val tmpDir = createTempDirectory() diff --git a/tests/mute-common.csv b/tests/mute-common.csv index 1d41bdc353e..0256f5cb54c 100644 --- a/tests/mute-common.csv +++ b/tests/mute-common.csv @@ -55,4 +55,7 @@ org.jetbrains.uast.test.kotlin.KotlinUastTypesTest.testEa101715, Unprocessed,, org.jetbrains.kotlin.idea.quickfix.QuickFixTestGenerated.CreateFromUsage.CreateFunction.Invoke.testLambdaArgument, Unprocessed,, org.jetbrains.kotlin.idea.decompiler.navigation.NavigateJavaToLibrarySourceTestGenerated.testClassAndConstuctors, Unprocessed,, org.jetbrains.kotlin.idea.decompiler.navigation.NavigateJavaToLibrarySourceTestGenerated.testOverloadedFun, Unprocessed,, -org.jetbrains.kotlin.idea.decompiler.navigation.NavigateJavaToLibrarySourceTestGenerated.testRenamedElements, Unprocessed,, \ No newline at end of file +org.jetbrains.kotlin.idea.decompiler.navigation.NavigateJavaToLibrarySourceTestGenerated.testRenamedElements, Unprocessed,, +org.jetbrains.kotlin.idea.navigation.GotoWithMultipleLibrariesTest.testOneHasSourceAndOneDoesNot,,, FLAKY +org.jetbrains.kotlin.idea.navigation.GotoWithMultipleLibrariesTest.testOneHasSourceAndManyDoNot,,, FLAKY +org.jetbrains.kotlin.idea.navigation.GotoWithMultipleLibrariesTest.testSeveralWithSource,,, FLAKY \ No newline at end of file