From fa9aabee5dfb297f0075938fb16bae73031ffda1 Mon Sep 17 00:00:00 2001
From: lberki <lberki@google.com>
Date: Fri, 26 Feb 2021 10:52:39 +0100
Subject: [PATCH] Make AspectTest.topLevelConflictDetected not flaky.

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

RELNOTES: None.
PiperOrigin-RevId: 359713477
---
 .../com/google/devtools/build/lib/analysis/AspectTest.java  | 6 +++---
 1 file changed, 3 insertions(+), 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
index d2a97a57a13b1d..a893ded5fdafe6 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 @@ 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"));