Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-3473 Some tests were leaving a directory named null for journal files under tests/integration-tests

This commit is contained in:
Clebert Suconic 2021-09-10 17:43:06 -04:00
parent cdc046a152
commit 7792d8f7b3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
View File

@ -196,7 +196,7 @@ public abstract class ActiveMQTestBase extends Assert {
* your data even under ./target. * your data even under ./target.
* Do not try to disable this rule! Fix your test! */ * Do not try to disable this rule! Fix your test! */
@Rule @Rule
public NoFilesBehind noFilesBehind = new NoFilesBehind("data"); public NoFilesBehind noFilesBehind = new NoFilesBehind("data", "null");
/** This will cleanup any system property changed inside tests */ /** This will cleanup any system property changed inside tests */
@Rule @Rule
@ -406,10 +406,14 @@ public abstract class ActiveMQTestBase extends Assert {
} }
} }
@Before
public void setupTestDir() {
testDir = temporaryFolder.getRoot().getAbsolutePath();
}
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
sendMsgCount = 0; sendMsgCount = 0;
testDir = temporaryFolder.getRoot().getAbsolutePath();
clearDataRecreateServerDirs(); clearDataRecreateServerDirs();
OperationContextImpl.clearContext(); OperationContextImpl.clearContext();

1
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
View File

@ -130,6 +130,7 @@ public class MQTTTestSupport extends ActiveMQTestBase {
@Override @Override
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
super.setUp();
String basedir = basedir().getPath(); String basedir = basedir().getPath();
System.setProperty("javax.net.ssl.trustStore", basedir + "/src/test/resources/client.keystore"); System.setProperty("javax.net.ssl.trustStore", basedir + "/src/test/resources/client.keystore");
System.setProperty("javax.net.ssl.trustStorePassword", "password"); System.setProperty("javax.net.ssl.trustStorePassword", "password");