From bbe9f9adceb9ab6561ce247f22b3c47d856f0ec0 Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Fri, 10 Jan 2020 17:35:28 -0500 Subject: [PATCH] NO-JIRA Adding test name into temporary folder name directory This is to make it possible to identify what test is leaking files whenever that is happening. That is because future tests will report the leaks, and it's difficult to identify where it happened. Also i'm changing NoProcessFilesBehind to show the getOpenFD propertly --- .../apache/activemq/artemis/tests/util/ActiveMQTestBase.java | 4 +++- .../activemq/artemis/tests/util/NoProcessFilesBehind.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java index bd5836e162..b5f6b30d0a 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java @@ -264,7 +264,9 @@ public abstract class ActiveMQTestBase extends Assert { public ActiveMQTestBase() { File parent = new File(TARGET_TMP); parent.mkdirs(); - temporaryFolder = new TemporaryFolder(parent); + File subParent = new File(parent, this.getClass().getSimpleName()); + subParent.mkdirs(); + temporaryFolder = new TemporaryFolder(subParent); } protected T serialClone(Object object) throws Exception { diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/NoProcessFilesBehind.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/NoProcessFilesBehind.java index c9e6dadefe..527ffb2135 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/NoProcessFilesBehind.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/NoProcessFilesBehind.java @@ -139,7 +139,7 @@ public class NoProcessFilesBehind extends TestWatcher { if (!Wait.waitFor(() -> getOpenFD() < maxFiles, 5000, 0)) { String fileList = getOpenList(); - Assert.fail("Too many files open (" + maxFiles + "). A possible list: " + fileList); + Assert.fail("Too many files open (" + getOpenFD() + ">" + maxFiles + "). A possible list: " + fileList); } }