QPID-7546: [System Tests] Fix BDBBackupTest for AMQP 1.0 persistent profile. Exclude MultiNode/TwoNode tests
diff --git a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java
index acaef85..3bb82c4 100644
--- a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java
+++ b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java
@@ -52,7 +52,7 @@
private File _backupFromDir;
@Override
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
_backupToDir = new File(SYSTEM_TMP_DIR + File.separator + getTestName());
@@ -66,7 +66,7 @@
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
try
{
@@ -97,9 +97,7 @@
{
Connection con = getConnection();
Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
- Destination destination = session.createQueue(getTestQueueName());
- // Create queue by consumer side-effect
- session.createConsumer(destination).close();
+ Destination destination = createTestQueue(session);
final int numOfMessages = endIndex - startIndex;
final int batchSize = 0;
diff --git a/test-profiles/Java10Excludes b/test-profiles/Java10Excludes
index bbbfd0f..0328068 100644
--- a/test-profiles/Java10Excludes
+++ b/test-profiles/Java10Excludes
@@ -193,13 +193,18 @@
/ Test is 0-10 specific
org.apache.qpid.client.ssl.SSLTest#testMultipleCertsInSingleStore
-// Test assumes BURL and Connection URL format
+// Tests assume BURL and/or Connection URL formats
org.apache.qpid.systest.rest.ExportImportMessagesRestTest#testExtractImportEndToEnd
+org.apache.qpid.server.store.berkeleydb.replication.MultiNodeTest#*
+org.apache.qpid.server.store.berkeleydb.replication.TwoNodeTest#*
// Qpid JMS Client does not support the use of preestablished socket
org.apache.qpid.client.connection.ExistingSocketTest#*
-
+// These tests assume names of queues backing durable subscriptions
+org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#testConsumptionOfUpgradedMessages
+org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#testDurableSubscriptionWithoutSelector
+org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#testSelectorDurability
