summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2009-08-03 16:00:51 +0000
committerMartin Ritchie <ritchiem@apache.org>2009-08-03 16:00:51 +0000
commit946bf3f4ea756513556c04d7fd9bd8cbdd9f382e (patch)
treee86bc1e58011fff1030f0cf0f8b364b25daa02ca
parentd3f14331a2c3bbd889a19c42002ea01ddec6e3df (diff)
downloadqpid-python-946bf3f4ea756513556c04d7fd9bd8cbdd9f382e.tar.gz
QPID-2019 : Update Exclude mechanism so we can exclude the new logging tests from the CPP broker
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@800439 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java3
-rw-r--r--java/test-profiles/010Excludes2
2 files changed, 4 insertions, 1 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index 096bf4cfd1..c182db5d78 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -251,7 +251,8 @@ public class QpidTestCase extends TestCase
public void run(TestResult testResult)
{
- if (_exclusionList != null && (_exclusionList.contains(getClass().getName() + "#*") ||
+ if (_exclusionList != null && (_exclusionList.contains(getClass().getPackage().getName() + ".*") ||
+ _exclusionList.contains(getClass().getName() + "#*") ||
_exclusionList.contains(getClass().getName() + "#" + getName())))
{
_logger.info("Test: " + getName() + " is excluded");
diff --git a/java/test-profiles/010Excludes b/java/test-profiles/010Excludes
index 69077a97c8..643a26bb9d 100644
--- a/java/test-profiles/010Excludes
+++ b/java/test-profiles/010Excludes
@@ -77,3 +77,5 @@ org.apache.qpid.server.store.PersistentStoreTest#*
// QPID-1225 : Temporary remove this test until the problem has been addressed
org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess
+// CPP Broker does not follow the same Logging convention as the Java broker
+org.apache.qpid.server.logging.*