You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2015/04/10 20:44:31 UTC
[1/2] activemq-6 git commit: using temporary folders under ./target
Repository: activemq-6
Updated Branches:
refs/heads/master d9c9fc0e9 -> 45f02a880
using temporary folders under ./target
Sometimes /tmp doesn't support ext4 (tmpfs) and there's always a risk of leaving unnatended files in cases of crashed.
This is in alignment with how other tests run at apache
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/44bfe26f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/44bfe26f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/44bfe26f
Branch: refs/heads/master
Commit: 44bfe26f3cee9e11b3fdcf69b2fadf4b89a6b4a1
Parents: d9c9fc0
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Apr 9 15:57:58 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Apr 9 22:03:03 2015 -0400
----------------------------------------------------------------------
.../activemq/tests/util/RemoveFolder.java | 43 ++++++++++++++++++++
.../activemq/tests/util/UnitTestCase.java | 18 +++++++-
.../integration/discovery/DiscoveryTest.java | 2 +-
.../jms/server/JMSServerStartStopTest.java | 4 --
.../colocated-server-start-stop-config1.xml | 16 ++++----
.../colocated-server-start-stop-config2.xml | 18 ++++----
.../resources/server-start-stop-config1.xml | 2 +-
.../test/resources/test-jgroups-file_ping.xml | 2 +-
8 files changed, 80 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/44bfe26f/activemq-server/src/test/java/org/apache/activemq/tests/util/RemoveFolder.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/RemoveFolder.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/RemoveFolder.java
new file mode 100644
index 0000000..0f33ffc
--- /dev/null
+++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/RemoveFolder.java
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.tests.util;
+
+import java.io.File;
+
+import org.junit.rules.ExternalResource;
+
+/**
+ * This will remove a folder on a tearDown *
+ */
+public class RemoveFolder extends ExternalResource
+{
+ private final String folderName;
+
+ public RemoveFolder(String folderName)
+ {
+ this.folderName = folderName;
+ }
+
+ /**
+ * Override to tear down your specific external resource.
+ */
+ protected void after()
+ {
+ UnitTestCase.deleteDirectory(new File(folderName));
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/44bfe26f/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java
index 1bfdbf6..78070a9 100644
--- a/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java
+++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java
@@ -123,13 +123,21 @@ import org.junit.rules.TestName;
*/
public abstract class UnitTestCase extends CoreUnitTestCase
{
+ public static final String TARGET_TMP = "./target/tmp";
// Constants -----------------------------------------------------
@Rule
public TestName name = new TestName();
@Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ public TemporaryFolder temporaryFolder;
+
+ @Rule
+ // This Custom rule will remove any files under ./target/tmp
+ // including anything created previously by TemporaryFolder
+ public RemoveFolder folder = new RemoveFolder(TARGET_TMP);
+
+
private String testDir;
private static final ActiveMQServerLogger log = ActiveMQServerLogger.LOGGER;
@@ -147,6 +155,14 @@ public abstract class UnitTestCase extends CoreUnitTestCase
private static final String OS_TYPE = System.getProperty("os.name").toLowerCase();
private static final int DEFAULT_UDP_PORT;
+
+ public UnitTestCase()
+ {
+ File parent = new File(TARGET_TMP);
+ parent.mkdirs();
+ temporaryFolder = new TemporaryFolder(parent);
+ }
+
static
{
Random random = new Random();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/44bfe26f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java
index d50dffe..4a23fdd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/discovery/DiscoveryTest.java
@@ -76,7 +76,7 @@ public class DiscoveryTest extends DiscoveryBaseTest
public void tearDown() throws Exception
{
/** This file path is defined at {@link #TEST_JGROUPS_CONF_FILE} */
- deleteDirectory(new File("/tmp/amqtest.ping.dir"));
+ deleteDirectory(new File("./target/tmp/amqtest.ping.dir"));
for (ActiveMQComponent component : new ActiveMQComponent[]{bg, bg1, bg2, bg3, dg, dg1, dg2, dg3})
{
stopComponent(component);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/44bfe26f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java
index 5181240..ca4a6a6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/JMSServerStartStopTest.java
@@ -200,10 +200,6 @@ public class JMSServerStartStopTest extends UnitTestCase
deploymentManager.addDeployable(fileConfiguration);
deploymentManager.readConfiguration();
- fc.setJournalDirectory(getJournalDir());
- fc.setBindingsDirectory(getBindingsDir());
- fc.setLargeMessagesDirectory(getLargeMessagesDir());
-
ActiveMQSecurityManager sm = new ActiveMQSecurityManagerImpl();
ActiveMQServer liveServer = addServer(new ActiveMQServerImpl(fc, sm));
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/44bfe26f/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
index 9eb1525..c04de3d 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
@@ -22,10 +22,10 @@
<connector name="netty-connector">tcp://localhost:61616</connector>
</connectors>
- <paging-directory>/tmp/activemq-unit-test/live1/paging</paging-directory>
- <bindings-directory>/tmp/activemq-unit-test/live1/binding</bindings-directory>
- <journal-directory>/tmp/activemq-unit-test/live1/journal</journal-directory>
- <large-messages-directory>/tmp/activemq-unit-test/live1/largemessages</large-messages-directory>
+ <paging-directory>./target/tmp/activemq-unit-test/live1/paging</paging-directory>
+ <bindings-directory>./target/tmp/activemq-unit-test/live1/binding</bindings-directory>
+ <journal-directory>./target/tmp/activemq-unit-test/live1/journal</journal-directory>
+ <large-messages-directory>./target/tmp/activemq-unit-test/live1/largemessages</large-messages-directory>
<acceptors>
<acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
@@ -62,10 +62,10 @@
<backup-servers>
<backup-server name="myBackup" port-offset="100" inherit-configuration="true" backup-strategy="FULL">
<configuration>
- <paging-directory>/tmp/activemq-unit-test/live2/paging</paging-directory>
- <bindings-directory>/tmp/activemq-unit-test/live2/binding</bindings-directory>
- <journal-directory>/tmp/activemq-unit-test/live2/journal</journal-directory>
- <large-messages-directory>/tmp/activemq-unit-test/live2/largemessages</large-messages-directory>
+ <paging-directory>./target/tmp/activemq-unit-test/live2/paging</paging-directory>
+ <bindings-directory>./target/tmp/activemq-unit-test/live2/binding</bindings-directory>
+ <journal-directory>./target/tmp/activemq-unit-test/live2/journal</journal-directory>
+ <large-messages-directory>./target/tmp/activemq-unit-test/live2/largemessages</large-messages-directory>
</configuration>
</backup-server>
</backup-servers>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/44bfe26f/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
index 560225e..1e0b266 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
@@ -22,11 +22,11 @@
<connector name="netty-connector">tcp://localhost:5645</connector>
</connectors>
- <paging-directory>/tmp/activemq-unit-test/live2/paging</paging-directory>
- <bindings-directory>/tmp/activemq-unit-test/live2/binding</bindings-directory>
- <journal-directory>/tmp/activemq-unit-test/live2/journal</journal-directory>
- <large-messages-directory>/tmp/activemq-unit-test/live2/largemessages</large-messages-directory>
-
+ <paging-directory>./target/tmp/activemq-unit-test/live2/paging</paging-directory>
+ <bindings-directory>./target/tmp/activemq-unit-test/live2/binding</bindings-directory>
+ <journal-directory>./target/tmp/activemq-unit-test/live2/journal</journal-directory>
+ <large-messages-directory>./target/tmp/activemq-unit-test/live2/largemessages</large-messages-directory>
+
<acceptors>
<acceptor name="netty-acceptor">tcp://localhost:5645</acceptor>
</acceptors>
@@ -61,10 +61,10 @@
<backup-servers>
<backup-server name="myBackup" port-offset="100" inherit-configuration="true" backup-strategy="FULL">
<configuration>
- <paging-directory>/tmp/activemq-unit-test/live1/paging</paging-directory>
- <bindings-directory>/tmp/activemq-unit-test/live1/binding</bindings-directory>
- <journal-directory>/tmp/activemq-unit-test/live1/journal</journal-directory>
- <large-messages-directory>/tmp/activemq-unit-test/live1/largemessages</large-messages-directory>
+ <paging-directory>./target/tmp/activemq-unit-test/live1/paging</paging-directory>
+ <bindings-directory>./target/tmp/activemq-unit-test/live1/binding</bindings-directory>
+ <journal-directory>./target/tmp/activemq-unit-test/live1/journal</journal-directory>
+ <large-messages-directory>./target/tmp/activemq-unit-test/live1/largemessages</large-messages-directory>
</configuration>
</backup-server>
</backup-servers>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/44bfe26f/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
index 8a9a348..46142dd 100644
--- a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
@@ -26,7 +26,7 @@
<connector name="netty-connector">tcp://localhost:61616</connector>
</connectors>
- <journal-directory>/tmp/activemq-unit-test/start-stop-data</journal-directory>
+ <journal-directory>./target/tmp/activemq-unit-test/start-stop-data</journal-directory>
<acceptors>
<acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/44bfe26f/tests/integration-tests/src/test/resources/test-jgroups-file_ping.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/test-jgroups-file_ping.xml b/tests/integration-tests/src/test/resources/test-jgroups-file_ping.xml
index 22f48a1..0d115bc 100644
--- a/tests/integration-tests/src/test/resources/test-jgroups-file_ping.xml
+++ b/tests/integration-tests/src/test/resources/test-jgroups-file_ping.xml
@@ -43,7 +43,7 @@
oob_thread_pool.queue_max_size="100"
oob_thread_pool.rejection_policy="run"/>
- <FILE_PING location="/tmp/hqtest.ping.dir"/>
+ <FILE_PING location="./target/tmp/amqtest.ping.dir"/>
<MERGE2 max_interval="30000"
min_interval="10000"/>
<FD_SOCK/>
[2/2] activemq-6 git commit: This closes #204 tmp dir change for tests
Posted by jb...@apache.org.
This closes #204 tmp dir change for tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/45f02a88
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/45f02a88
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/45f02a88
Branch: refs/heads/master
Commit: 45f02a88072222411ce79e8ca33790d13b035624
Parents: d9c9fc0 44bfe26
Author: jbertram <jb...@redhat.com>
Authored: Fri Apr 10 13:43:44 2015 -0500
Committer: jbertram <jb...@redhat.com>
Committed: Fri Apr 10 13:43:44 2015 -0500
----------------------------------------------------------------------
.../activemq/tests/util/RemoveFolder.java | 43 ++++++++++++++++++++
.../activemq/tests/util/UnitTestCase.java | 18 +++++++-
.../integration/discovery/DiscoveryTest.java | 2 +-
.../jms/server/JMSServerStartStopTest.java | 4 --
.../colocated-server-start-stop-config1.xml | 16 ++++----
.../colocated-server-start-stop-config2.xml | 18 ++++----
.../resources/server-start-stop-config1.xml | 2 +-
.../test/resources/test-jgroups-file_ping.xml | 2 +-
8 files changed, 80 insertions(+), 25 deletions(-)
----------------------------------------------------------------------