diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java index 86372ddf594..12ef340c7ce 100644 --- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java +++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenImportingTestCase.java @@ -57,6 +57,8 @@ import java.io.IOException; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import static org.jetbrains.kotlin.test.MuteWithDatabaseKt.isIgnoredInDatabaseWithLog; + public abstract class MavenImportingTestCase extends MavenTestCase { protected MavenProjectsTree myProjectsTree; protected MavenProjectsManager myProjectsManager; @@ -100,6 +102,11 @@ public abstract class MavenImportingTestCase extends MavenTestCase { } } + @Override + protected boolean shouldRunTest() { + return super.shouldRunTest() && !isIgnoredInDatabaseWithLog(this); + } + protected void assertModules(String... expectedNames) { Module[] actual = ModuleManager.getInstance(myProject).getModules(); List actualNames = new ArrayList(); diff --git a/tests/mute.csv b/tests/mute.csv index 02273818bb3..67bcd8e7b74 100644 --- a/tests/mute.csv +++ b/tests/mute.csv @@ -64,3 +64,8 @@ org.jetbrains.kotlin.idea.maven.KotlinMavenInspectionTestGenerated.testWrongPhas org.jetbrains.kotlin.idea.decompiler.stubBuilder.BuiltInDecompilerTest.testBuiltInStubTreeEqualToStubTreeFromDecompiledText, FLAKY No classes with this name found: kotlin.ArithmeticException org.jetbrains.kotlin.idea.decompiler.stubBuilder.BuiltInDecompilerConsistencyTest.testSameAsClsDecompilerForCompiledBuiltInClasses, FLAKY No classes with this name found: kotlin.ArithmeticException org.jetbrains.kotlin.idea.completion.test.JvmSmartCompletionTestGenerated.testFilterTo, KT-32919 Broken in 71cb65c064c7 or 2d5a05466dfa +org.jetbrains.kotlin.checkers.JavaAgainstKotlinSourceCheckerWithoutUltraLightTestGenerated.JavaAgainstKotlin.testUsingMutableInterfaces, FLAKY +org.jetbrains.kotlin.checkers.JavaAgainstKotlinSourceCheckerWithoutUltraLightTestGenerated.JavaAgainstKotlin.testUsingReadOnlyInterfaces, FLAKY +org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInTempDirTest.testKotlincExistsNoSettingsLatestRuntimeNoVersionAutoAdvance, FLAKY +org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInTempDirTest.testNoKotlincExistsNoSettingsRuntime10, FLAKY +org.jetbrains.kotlin.idea.maven.MavenMigrateTest.testMigrateApiAndLanguageVersions, FLAKY on windows \ No newline at end of file diff --git a/tests/mute.csv.191 b/tests/mute.csv.191 index 4f4bfc49604..a4484e5461d 100644 --- a/tests/mute.csv.191 +++ b/tests/mute.csv.191 @@ -47,3 +47,8 @@ org.jetbrains.kotlin.idea.maven.KotlinMavenInspectionTestGenerated.testWrongPhas org.jetbrains.kotlin.idea.decompiler.stubBuilder.BuiltInDecompilerTest.testBuiltInStubTreeEqualToStubTreeFromDecompiledText, FLAKY No classes with this name found: kotlin.ArithmeticException org.jetbrains.kotlin.idea.decompiler.stubBuilder.BuiltInDecompilerConsistencyTest.testSameAsClsDecompilerForCompiledBuiltInClasses, FLAKY No classes with this name found: kotlin.ArithmeticException org.jetbrains.kotlin.idea.completion.test.JvmSmartCompletionTestGenerated.testFilterTo, KT-32919 Broken in 71cb65c064c7 or 2d5a05466dfa +org.jetbrains.kotlin.checkers.JavaAgainstKotlinSourceCheckerWithoutUltraLightTestGenerated.JavaAgainstKotlin.testUsingMutableInterfaces, FLAKY +org.jetbrains.kotlin.checkers.JavaAgainstKotlinSourceCheckerWithoutUltraLightTestGenerated.JavaAgainstKotlin.testUsingReadOnlyInterfaces, FLAKY +org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInTempDirTest.testKotlincExistsNoSettingsLatestRuntimeNoVersionAutoAdvance, FLAKY +org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInTempDirTest.testNoKotlincExistsNoSettingsRuntime10, FLAKY +org.jetbrains.kotlin.idea.maven.MavenMigrateTest.testMigrateApiAndLanguageVersions, FLAKY on windows \ No newline at end of file diff --git a/tests/mute.csv.193 b/tests/mute.csv.193 index 88437ee02ff..9689ec046f6 100644 --- a/tests/mute.csv.193 +++ b/tests/mute.csv.193 @@ -184,3 +184,8 @@ org.jetbrains.kotlin.idea.maven.KotlinMavenInspectionTestGenerated.testWrongPhas org.jetbrains.kotlin.idea.decompiler.stubBuilder.BuiltInDecompilerTest.testBuiltInStubTreeEqualToStubTreeFromDecompiledText, FLAKY No classes with this name found: kotlin.ArithmeticException org.jetbrains.kotlin.idea.decompiler.stubBuilder.BuiltInDecompilerConsistencyTest.testSameAsClsDecompilerForCompiledBuiltInClasses, FLAKY No classes with this name found: kotlin.ArithmeticException org.jetbrains.kotlin.idea.completion.test.JvmSmartCompletionTestGenerated.testFilterTo, KT-32919 Broken in 71cb65c064c7 or 2d5a05466dfa +org.jetbrains.kotlin.checkers.JavaAgainstKotlinSourceCheckerWithoutUltraLightTestGenerated.JavaAgainstKotlin.testUsingMutableInterfaces, FLAKY +org.jetbrains.kotlin.checkers.JavaAgainstKotlinSourceCheckerWithoutUltraLightTestGenerated.JavaAgainstKotlin.testUsingReadOnlyInterfaces, FLAKY +org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInTempDirTest.testKotlincExistsNoSettingsLatestRuntimeNoVersionAutoAdvance, FLAKY +org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInTempDirTest.testNoKotlincExistsNoSettingsRuntime10, FLAKY +org.jetbrains.kotlin.idea.maven.MavenMigrateTest.testMigrateApiAndLanguageVersions, FLAKY on windows \ No newline at end of file