diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-08-07 18:08:54 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-08-07 18:08:54 +0000 |
| commit | 541bd6f73a7a43fe8abc3cf1567db1f4e77c23bc (patch) | |
| tree | 5f1eae2ae52a1ad18350e0245a84e32c431d3865 | |
| parent | 667199ed6496a797d0ef47a0401ab144565d0f7c (diff) | |
| download | qpid-python-541bd6f73a7a43fe8abc3cf1567db1f4e77c23bc.tar.gz | |
Ensured monitor resets do not exclude test connnection setup
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@802120 13f79535-47bb-0310-9956-ffa450edef68
3 files changed, 8 insertions, 7 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java b/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java index b83c284ef4..ddbed2aab8 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java +++ b/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java @@ -57,11 +57,12 @@ public class DurableQueueLoggingTest extends AbstractTestLogging public void setUp() throws Exception { super.setUp(); + //Ensure we only have logs from our test + _monitor.reset(); + _connection = getConnection(); _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE); _durable = true; - //Ensure we only have logs from our - _monitor.reset(); } /** diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java b/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java index 1b154f70ac..a8b532d772 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java +++ b/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java @@ -53,11 +53,11 @@ public class QueueLoggingTest extends AbstractTestLogging public void setUp() throws Exception { super.setUp(); - _connection = getConnection(); - _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - //Remove broker startup logging messages _monitor.reset(); + + _connection = getConnection(); + _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE); } /** diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java b/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java index 7283f7f0d0..11e345de5e 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java +++ b/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java @@ -51,6 +51,8 @@ public class SubscriptionLoggingTest extends AbstractTestLogging public void setUp() throws Exception { super.setUp(); + //Remove broker startup logging messages + _monitor.reset(); _connection = getConnection(); @@ -58,8 +60,6 @@ public class SubscriptionLoggingTest extends AbstractTestLogging _queue = (Queue) getInitialContext().lookup(QUEUE); _topic = (Topic) getInitialContext().lookup(TOPIC); - - _monitor.reset(); } /** |