X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-ust-java-tests-log4j%2Fsrc%2Ftest%2Fjava%2Forg%2Flttng%2Fust%2Fagent%2Fintegration%2Fevents%2FLog4jLegacyApiIT.java;h=b824ef09119fbff574cc8efb8c94ff0b97a681e9;hb=b342ee75b8f1dd103fc049095de6e1242fc119a6;hp=50e824e9a7305a650c04dde6133c17dcec2ac1da;hpb=0fcd7d54f65aac677d9431b3ff95c9274646970c;p=lttng-ust-java-tests.git

diff --git a/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/events/Log4jLegacyApiIT.java b/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/events/Log4jLegacyApiIT.java
index 50e824e..b824ef0 100644
--- a/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/events/Log4jLegacyApiIT.java
+++ b/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/events/Log4jLegacyApiIT.java
@@ -29,6 +29,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -176,10 +177,16 @@ public class Log4jLegacyApiIT {
         List<String> enabledEvents = session.listEvents();
         List<String> expectedEvents = Arrays.asList(EVENT_NAME_A, EVENT_NAME_B);
 
-        Collections.sort(enabledEvents);
-        Collections.sort(expectedEvents);
-
-        assertEquals(expectedEvents, enabledEvents);
+        /*
+         * It doesn't seem possible to forcibly remove Loggers with log4j 1.2.
+         * This, coupled with the way the legacy agent works, makes it so
+         * loggers defined in other tests will always "leak" into this one when
+         * running the whole test suite.
+         *
+         * For this test, simply check that the expected names are present, and
+         * let pass the case where other loggers may the present too.
+         */
+        expectedEvents.forEach(event -> assertTrue(enabledEvents.contains(event)));
     }
 
     /**