commit 42a2de00e4198169a15f74bdb236a87239024592
author mschaller <mschaller@google.com> Thu Mar 04 07:43:44 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Mar 04 07:45:04 2021 -0800
tree 6bee7217a0ec84836accbea871973aca0e90e804
parent 64ae4170978e4d04088144d7d9a16ec387521119

Continue making AspectTest.topLevelConflictDetected not flaky

A previous change recently make the preceding exception message check
insensitive to aspect analysis order. This one should be too.

RELNOTES: None.
PiperOrigin-RevId: 360913720

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 a893ded..deaf363 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
@@ -989,8 +989,8 @@
                     "//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 .'");
   }
 }