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

Improve stability of KahaDB tests

This commit is contained in:
jbonofre 2020-11-18 09:02:01 +01:00
parent 1be0d3228d
commit 8c384676a8
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-broker/src/test/java/org/apache/activemq/store/PListTestSupport.java
View File

@ -278,7 +278,7 @@ public abstract class PListTestSupport {
executor.execute(new B());
executor.shutdown();
boolean finishedInTime = executor.awaitTermination(5, TimeUnit.MINUTES);
boolean finishedInTime = executor.awaitTermination(10, TimeUnit.MINUTES);
LOG.info("Tested completion finished in time? -> {}", finishedInTime ? "YES" : "NO");
assertTrue("no exceptions", exceptions.isEmpty());

10
activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/scheduler/AMQ7086Test.java
View File

@ -42,7 +42,7 @@ public class AMQ7086Test {
JobSchedulerStoreImpl jobSchedulerStore;
KahaDBPersistenceAdapter kahaDBPersistenceAdapter;
@Test
@Test(timeout = 120000)
public void testGcDoneAtStop() throws Exception {
brokerService = createBroker(true);
@ -63,8 +63,14 @@ public class AMQ7086Test {
brokerService.stop();
while (verifyFilesOnDisk(jobDir) < 1) {
Thread.sleep(100);
}
assertTrue("Expected job store data files at least 1", verifyFilesOnDisk(jobDir) >= 1);
assertEquals("Expected kahadb data files", 1, verifyFilesOnDisk(kahaDir));
while (verifyFilesOnDisk(kahaDir) < 1) {
Thread.sleep(100);
}
assertTrue("Expected kahadb data files at least 1", verifyFilesOnDisk(kahaDir) >= 1);
}
@Test