summaryrefslogtreecommitdiff
path: root/qpid/java/test-profiles
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2009-09-10 14:41:08 +0000
committerMartin Ritchie <ritchiem@apache.org>2009-09-10 14:41:08 +0000
commit2b2895d6f86cd90a61a1451df65ba16a647b5f2a (patch)
treec5d43a42e8188c1c458f192593e9fb2b0d0acedc /qpid/java/test-profiles
parent4b59f06b5398d9a349b2c6054f28ca58ada84a6d (diff)
downloadqpid-python-2b2895d6f86cd90a61a1451df65ba16a647b5f2a.tar.gz
QPID-2092 Move test configuration to systest package and update to provide an more reliable way of adjusting the configuration form the test. In doing this it made sense to udpate the configurations such that they all inherit from the cannonical config.xml from the broker package. Each test now gets its own configuration file that is used to override the defaut values in config.xml.
So the config is now a hierarchy of: - Test Specific - Systest adjustments - stock broker config.xml I have disabled the DerbyMessageStoreLoggingTest as after making this change it is more reliably throwing a Derby exception on broker startup. The other changes to the tests were to ensure they correctly save the Test Specific config file before loading. As for some reason, Commons Configuration is not abiding by the optional flag. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@813461 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/test-profiles')
-rw-r--r--qpid/java/test-profiles/08Excludes3
-rw-r--r--qpid/java/test-profiles/Excludes6
2 files changed, 8 insertions, 1 deletions
diff --git a/qpid/java/test-profiles/08Excludes b/qpid/java/test-profiles/08Excludes
index 0866694854..8598f1dc5b 100644
--- a/qpid/java/test-profiles/08Excludes
+++ b/qpid/java/test-profiles/08Excludes
@@ -15,3 +15,6 @@ org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
org.apache.qpid.client.SessionCreateTest#*
org.apache.qpid.test.client.RollbackOrderTest#*
+
+// MALT requries an external broker so exclude it from the InVM test runs
+org.apache.qpid.management.jmx.ManagementActorLoggingTest
diff --git a/qpid/java/test-profiles/Excludes b/qpid/java/test-profiles/Excludes
index 7ef2a15e51..49f6946945 100644
--- a/qpid/java/test-profiles/Excludes
+++ b/qpid/java/test-profiles/Excludes
@@ -13,5 +13,9 @@ org.apache.qpid.server.logging.BrokerLoggingTest#testBrokerShutdownListeningTCPS
org.apache.qpid.server.logging.BrokerLoggingTest#testBrokerShutdownStopped
org.apache.qpid.server.logging.VirtualHostLoggingTest#testVirtualhostClosure
org.apache.qpid.server.logging.MemoryMessageStoreLoggingTest#testMessageStoreClose
-org.apache.qpid.server.logging.DerbyMessageStoreLoggingTest#testMessageStoreClose
+// QPID-XXX : Test fails to start external broker due to Derby Exception.
+org.apache.qpid.server.logging.DerbyMessageStoreLoggingTest#*
+
+// QPID-2081 :The configuration changes are now highlighting the close race condition
+org.apache.qpid.server.security.acl.SimipleACLTest#*