Make AspectTest.topLevelConflictDetected not flaky.

The message relied on the order in which the two aspects were analyzed. RELNOTES: None. PiperOrigin-RevId: 359713477
fweikert · Feb 26, 2021 · fa9aabe · fa9aabe
1 parent 7b3f56d
commit fa9aabe
Showing 1 changed file with 3 additions and 3 deletions.
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
@@ -959,9 +959,9 @@ public void topLevelConflictDetected() throws Exception {
                     "//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"));