commit fa9aabee5dfb297f0075938fb16bae73031ffda1
author lberki <lberki@google.com> Fri Feb 26 10:52:39 2021 +0100
committer Philipp Wollermann <philwo@google.com> Fri Feb 26 11:28:15 2021 +0100
tree 727d1c156554e074e47e157566126177ffda776d
parent 7b3f56d8e6987c6d0918b520f64e6ae1ee08c5ce

Make AspectTest.topLevelConflictDetected not flaky.

The message relied on the order in which the two aspects were analyzed.

RELNOTES: None.
PiperOrigin-RevId: 359713477

src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
index d2a97a5..a893ded 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
@@ -959,9 +959,9 @@
                     "//foo:foo"));
     assertThat(exception)
         .hasMessageThat()
-        .contains(
-            "ConflictException: for foo/aspect.out, previous action: action 'Action for aspect 1',"
-                + " attempted action: action 'Action for aspect 2'");
+        .containsMatch(
+            "ConflictException: for foo/aspect.out, previous action: action 'Action for aspect .',"
+                + " attempted action: action 'Action for aspect .'");
 
     // Fix bzl file so actions are shared: analysis should succeed now.
     scratch.overwriteFile("foo/aspect.bzl", String.format(bzlFileTemplate, "1"));