[jboss-cvs] JBoss Messaging SVN: r2915 - in trunk/tests/src/org/jboss/test/messaging/jms: bridge and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 19 17:47:55 EDT 2007
Author: timfox
Date: 2007-07-19 17:47:55 -0400 (Thu, 19 Jul 2007)
New Revision: 2915
Modified:
trunk/tests/src/org/jboss/test/messaging/jms/LongRunningInvocationTest.java
trunk/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java
trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java
trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectWithRecoveryTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/XAFailoverTest.java
Log:
Make sure poison interceptor is deactivated
Modified: trunk/tests/src/org/jboss/test/messaging/jms/LongRunningInvocationTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/LongRunningInvocationTest.java 2007-07-19 20:02:31 UTC (rev 2914)
+++ trunk/tests/src/org/jboss/test/messaging/jms/LongRunningInvocationTest.java 2007-07-19 21:47:55 UTC (rev 2915)
@@ -133,6 +133,8 @@
}
finally
{
+ ServerManagement.poisonTheServer(0, PoisonInterceptor.NULL);
+
conn.close();
}
@@ -174,6 +176,8 @@
}
finally
{
+ ServerManagement.poisonTheServer(0, PoisonInterceptor.NULL);
+
conn.close();
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java 2007-07-19 20:02:31 UTC (rev 2914)
+++ trunk/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java 2007-07-19 21:47:55 UTC (rev 2915)
@@ -376,6 +376,8 @@
}
finally
{
+ ServerManagement.poisonTheServer(1, PoisonInterceptor.NULL);
+
if (conn0 != null)
{
conn0.close();
@@ -550,6 +552,8 @@
}
finally
{
+ ServerManagement.poisonTheServer(1, PoisonInterceptor.NULL);
+
if (conn0 != null)
{
conn0.close();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java 2007-07-19 20:02:31 UTC (rev 2914)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java 2007-07-19 21:47:55 UTC (rev 2915)
@@ -164,35 +164,6 @@
log.error("Failed to undeploy", e);
}
-// for (int i = 0; i < nodeCount; i++)
-// {
-// try
-// {
-// if (ServerManagement.isStarted(i))
-// {
-// ServerManagement.log(ServerManagement.INFO, "Undeploying Server " + i, i);
-//
-// ServerManagement.stop(i);
-// }
-// }
-// catch (Exception e)
-// {
-// log.error("Failed to stop server", e);
-// }
-// }
-
-// for (int i = 1; i < nodeCount; i++)
-// {
-// try
-// {
-// ServerManagement.kill(i);
-// }
-// catch (Exception e)
-// {
-// log.error("Failed to kill server", e);
-// }
-// }
-
sc.stop();
super.tearDown();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectWithRecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectWithRecoveryTest.java 2007-07-19 20:02:31 UTC (rev 2914)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectWithRecoveryTest.java 2007-07-19 21:47:55 UTC (rev 2915)
@@ -154,7 +154,7 @@
}
finally
{
- log.info("In finally");
+ ServerManagement.poisonTheServer(1, PoisonInterceptor.NULL);
if (bridge != null)
{
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java 2007-07-19 20:02:31 UTC (rev 2914)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java 2007-07-19 21:47:55 UTC (rev 2915)
@@ -156,6 +156,8 @@
}
finally
{
+ ServerManagement.poisonTheServer(1, PoisonInterceptor.NULL);
+
if (conn != null)
{
conn.close();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2007-07-19 20:02:31 UTC (rev 2914)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2007-07-19 21:47:55 UTC (rev 2915)
@@ -1479,6 +1479,8 @@
}
finally
{
+ ServerManagement.poisonTheServer(1, PoisonInterceptor.NULL);
+
if (conn != null)
{
conn.close();
@@ -2023,6 +2025,8 @@
}
finally
{
+ ServerManagement.poisonTheServer(1, PoisonInterceptor.NULL);
+
if (conn != null)
{
conn.close();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/XAFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/XAFailoverTest.java 2007-07-19 20:02:31 UTC (rev 2914)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/XAFailoverTest.java 2007-07-19 21:47:55 UTC (rev 2915)
@@ -754,7 +754,6 @@
ServerManagement.poisonTheServer(1, PoisonInterceptor.TYPE_2PC_COMMIT);
-
log.info("################################################################## Sending a commit");
tm.commit();
@@ -840,6 +839,8 @@
}
finally
{
+ ServerManagement.poisonTheServer(1, PoisonInterceptor.NULL);
+
if (xaConn1 != null)
{
xaConn1.close();
@@ -1047,7 +1048,6 @@
numberOfReceivedMessages++;
}
-
assertFalse("\"plop0\" message was duplicated",
receivedMessages.contains("plop0"));
@@ -1071,14 +1071,13 @@
conn.close();
}
}
-
-
-
+
assertEquals(0, ((JBossConnection)xaConn1).getServerID());
-
}
finally
{
+ ServerManagement.poisonTheServer(1, PoisonInterceptor.NULL);
+
if (xaConn1 != null)
{
xaConn1.close();
More information about the jboss-cvs-commits
mailing list