From c6609e9a97060eb1e0a9f1e2d5d3d879b966f7d4 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Wed, 22 Apr 2020 15:30:53 +0300 Subject: [PATCH] Temporary remove flacky assert from GradleKtsImportTest --- .../kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt | 3 ++- tests/mute-platform.csv | 1 - tests/mute-platform.csv.201 | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt index d32b10d3c82..39c4cc6454c 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt @@ -116,7 +116,8 @@ class GradleKtsImportTest : GradleImportingTestCase() { } ) requireNotNull(reloadedConfiguration) - assertTrue(areSimilar(it.imported, reloadedConfiguration)) + // todo: script configuration can have different accessors, need investigation + // assertTrue(areSimilar(it.imported, reloadedConfiguration)) it.assertNoSuggestedConfiguration() } diff --git a/tests/mute-platform.csv b/tests/mute-platform.csv index 2b1d017031f..0ce722ac322 100644 --- a/tests/mute-platform.csv +++ b/tests/mute-platform.csv @@ -17,7 +17,6 @@ org.jetbrains.kotlin.idea.caches.resolve.MultiPlatformHighlightingTestGenerated. org.jetbrains.kotlin.idea.codeInsight.InspectionTestGenerated.Inspections.testAndroidIllegalIdentifiers_inspectionData_Inspections_test, Unprocessed org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testAndroidGradleJsDetection, NPE during import org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testKotlinAndroidPluginDetection, NPE during import -org.jetbrains.kotlin.idea.codeInsight.gradle.GradleKtsImportTest.testCompositeBuild, FLAKY on windows org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testTwoClasses, flaky failure org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testValAndClass, flaky failure org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testValOrder, flaky failure diff --git a/tests/mute-platform.csv.201 b/tests/mute-platform.csv.201 index 96fad61b391..f37ddb78a9d 100644 --- a/tests/mute-platform.csv.201 +++ b/tests/mute-platform.csv.201 @@ -57,7 +57,6 @@ org.jetbrains.kotlin.idea.codeInsight.InspectionTestGenerated.Inspections.testAn org.jetbrains.kotlin.idea.codeInsight.OutOfBlockModificationTestGenerated.testInSecondaryConstructorParameter, IDEA-234737 element.parent must not be null org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testAndroidGradleJsDetection, NPE during import org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testKotlinAndroidPluginDetection, NPE during import -org.jetbrains.kotlin.idea.codeInsight.gradle.GradleKtsImportTest.testCompositeBuild, FLAKY on windows org.jetbrains.kotlin.idea.codeInsight.gradle.GradleTestRunConfigurationAndHighlightingTest.preferredConfigurations[0: with Gradle-4.9], IDEA-234737 element.parent must not be null org.jetbrains.kotlin.idea.codeInsight.gradle.GradleTestRunConfigurationAndHighlightingTest.preferredConfigurations[1: with Gradle-5.6.4], IDEA-234737 element.parent must not be null org.jetbrains.kotlin.idea.codeInsight.surroundWith.SurroundWithTestGenerated.If.MoveDeclarationsOut.Order.testTwoClasses, flaky failure