summaryrefslogtreecommitdiff
path: root/qpid/java/systests
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2007-06-19 14:53:29 +0000
committerMartin Ritchie <ritchiem@apache.org>2007-06-19 14:53:29 +0000
commit7e4c859715e60572f391c781944c901ce45db42c (patch)
tree59fd4dc2c807946a5fa51cfd8a733d8849aefb0f /qpid/java/systests
parent8c8ee073330c02ba451a7a1a57e7da7110e4d8c0 (diff)
downloadqpid-python-7e4c859715e60572f391c781944c901ce45db42c.tar.gz
Fixed outstanding merge issues and updates to trunk code that were required for sl4j.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@548753 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests')
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
index f89dc73bc6..012a983be5 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
@@ -82,7 +82,7 @@ public class HeapExhaustion extends TestCase
*
* @throws Exception on error
*/
- public void testUntilFailure() throws Exception
+ public void testUntilFailureTransient() throws Exception
{
int copies = 0;
int total = 0;
@@ -102,7 +102,7 @@ public class HeapExhaustion extends TestCase
*
* @throws Exception on error
*/
- public void testUntilFailureWithDelays() throws Exception
+ public void testUntilFailureWithDelaysTransient() throws Exception
{
int copies = 0;
int total = 0;
@@ -137,7 +137,7 @@ public class HeapExhaustion extends TestCase
_logger.info("Running testUntilFailure");
try
{
- he.testUntilFailure();
+ he.testUntilFailureTransient();
}
catch (FailoverException fe)
{
@@ -186,7 +186,7 @@ public class HeapExhaustion extends TestCase
_logger.info("Running testUntilFailure");
try
{
- he.testUntilFailureWithDelays();
+ he.testUntilFailureWithDelaysTransient();
}
catch (FailoverException fe)
{