summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2009-07-14 11:40:37 +0000
committerRafael H. Schloming <rhs@apache.org>2009-07-14 11:40:37 +0000
commit3ff1c5b4e3ae449e6f3794544afb89b4a713bfcb (patch)
tree2e96873a15580f88ab5a1458dc7ded3f3d1158fe
parent9458e8ed680357e678e90e2899f9f269566bcc30 (diff)
downloadqpid-python-3ff1c5b4e3ae449e6f3794544afb89b4a713bfcb.tar.gz
added debug output to SimpleACLTest; fixed MultipleConnectionTest.waitUntil() to never call wait(0)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@793864 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java1
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
index 4db11e7db8..64838cd328 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
@@ -621,6 +621,7 @@ public class SimpleACLTest extends QpidTestCase implements ConnectionListener
if (!(cause instanceof AMQAuthenticationException))
{
+ cause.printStackTrace(System.out);
assertEquals("Incorrect exception", IllegalStateException.class, cause.getClass());
System.out.println("QPID-1204 : Session became closed and we got that error rather than the authentication error.");
}
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
index 658cf26135..4e85c28e9b 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
@@ -126,7 +126,7 @@ public class MultipleConnectionTest extends QpidTestCase
while (expected > _count)
{
long timeLeft = maxWait - timeSince(start);
- if (timeLeft < 0)
+ if (timeLeft <= 0)
{
break;
}