GERONIMO-4784 Recieving after rollback requires more time, so set second receive timeout to 2 seconds to make the pass; Also set the test counter smaller to save time, for trunk
git-svn-id: https://svn.apache.org/repos/asf/geronimo/server/trunk@1348548 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml b/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
index 1183c2b..47234de 100644
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
+++ b/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
@@ -141,6 +141,11 @@
<suiteXmlFiles>
<suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
</suiteXmlFiles>
+ <!-- <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds> -->
+ <systemPropertyVariables>
+ <total-shipment>2</total-shipment>
+ <requests-per-shipment>5</requests-per-shipment>
+ </systemPropertyVariables>
</configuration>
</plugin>
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/testng.xml b/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/testng.xml
index fe4d895..56b565f 100644
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/testng.xml
+++ b/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/testng.xml
@@ -27,9 +27,19 @@
<packages>
<package name="org.apache.geronimo.testsuite.enterprise.jms"/>
</packages>
+<!-- <classes> -->
+<!-- <class name="org.apache.geronimo.testsuite.enterprise.jms.JMSTest"/> -->
+<!-- <class name="org.apache.geronimo.testsuite.enterprise.jms.MessageSenderTest"/> -->
+<!-- </classes> -->
<!-- reverse what is commented out to just run the GERONIMO-4784 failing test -->
- <!--<classes>-->
- <!--<class name="org.apache.geronimo.testsuite.enterprise.jms.RollbackTest"/>-->
- <!--</classes>-->
+ <!-- <classes>
+ <class name="org.apache.geronimo.testsuite.enterprise.jms.RollbackTest">
+ <methods>
+ <include name="XXtestRollbackQUeueAndTopic"/>
+ <include name="testRollbackQueue"/>
+ <include name="testRollbackTopic"/>
+ </methods>
+ </class>
+ </classes> -->
</test>
</suite>
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtBean.java b/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtBean.java
index 6c5f23d..e07feb4 100644
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtBean.java
+++ b/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtBean.java
@@ -134,7 +134,7 @@
ut.begin();
try {
- received = consumer.receive(1000);
+ received = consumer.receive(2000);
if (received == null) throw new JMSException("Not received second time");
if (!to.equals(((ObjectMessage)received).getObject())) throw new JMSException("Wrong object inside: " + ((ObjectMessage)received).getObject());
} finally {
