summaryrefslogtreecommitdiff
path: root/qpid/java
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
commitd42e5f77a4860e8788fd65494979fc700b45690d (patch)
tree8f2ed0cdda67177687a133f2977d18c89336a233 /qpid/java
parent45d1215f11a389bd648977e88bc5e77c43ec47b1 (diff)
downloadqpid-python-d42e5f77a4860e8788fd65494979fc700b45690d.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@800439 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java3
-rw-r--r--qpid/java/test-profiles/010Excludes2
2 files changed, 4 insertions, 1 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index 096bf4cfd1..c182db5d78 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/qpid/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/qpid/java/test-profiles/010Excludes b/qpid/java/test-profiles/010Excludes
index 69077a97c8..643a26bb9d 100644
--- a/qpid/java/test-profiles/010Excludes
+++ b/qpid/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.*