Temporarily disable the flaky testConflictErrorAndUnfinishedAspectAna…

…lysis_mergedAnalysisExecution. PiperOrigin-RevId: 424568088
EngFlow · Jan 27, 2022 · 6c31c1d · 6c31c1d
1 parent 9e2d329
commit 6c31c1d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/OutputArtifactConflictTest.java b/src/test/java/com/google/devtools/build/lib/buildtool/OutputArtifactConflictTest.java
@@ -41,6 +41,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -413,6 +414,7 @@ public void testConflictErrorAndAnalysisError(@TestParameter boolean mergedAnaly
 
  // Verify that an aspect whose analysis is unfinished doesn't fail the conflict reporting process.
  @Test
+ @Ignore("b/216490090 - flaky")
  public void testConflictErrorAndUnfinishedAspectAnalysis_mergedAnalysisExecution(
  @TestParameter boolean keepGoing) throws Exception {
  addOptions("--experimental_merged_skyframe_analysis_execution");