[jboss-svn-commits] JBL Code SVN: r38177 - in labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP: qa/config and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Sep 13 08:22:30 EDT 2012
Author: mmusgrov
Date: 2012-09-13 08:22:30 -0400 (Thu, 13 Sep 2012)
New Revision: 38177
Modified:
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Environment.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/config/JBossTS_JTS_JacORB_QA.xml
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Utils/qautil.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client02.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client03.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client04.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client05.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client06.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client08.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client09.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client10.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client11.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client12.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client14.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client15.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client16.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client17.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client18.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Utils/Delays.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client02.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client03.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client04.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client05.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client06.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client08.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client09.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client10.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client11.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client12.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client14.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client15.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client16.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client17.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client18.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Utils/Delays.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery07Utils/Delays.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery08Utils/Delays.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Utils/Delays.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Utils/Delays.java
labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery11Utils/Delays.java
Log:
JBTM-1237 add a multiplication factor for extending QA test suite crash rec timeouts
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Environment.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Environment.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/Environment.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -164,5 +164,10 @@
*
*/
public static final String SERVER_BIND_ADDRESS = "jbossts.bind.address";
+
+ /**
+ * Multiplication factor by whick QA test suite crash rec test timeouts will be changed by
+ */
+ public static final String FACTOR_SYS_PROP = "ts.timeout.factor";
}
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/config/JBossTS_JTS_JacORB_QA.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/config/JBossTS_JTS_JacORB_QA.xml 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/config/JBossTS_JTS_JacORB_QA.xml 2012-09-13 12:22:30 UTC (rev 38177)
@@ -56,6 +56,7 @@
<node-configuration os="local">
<properties>
+ <property name="ts.timeout.factor" value="1"/>
<property name="Context.INITIAL_CONTEXT_FACTORY" value="com.sun.jndi.fscontext.RefFSContextFactory"/>
<property name="jdbcprofilestore.dir" value="$(PRODUCT.DIR)/qa/jdbc_profiles"/>
<property name="Context.PROVIDER_URL" value="file:$(PRODUCT.DIR)"/>
@@ -89,6 +90,7 @@
<node-configuration os="Linux">
<properties>
+ <property name="ts.timeout.factor" value="1"/>
<property name="Context.INITIAL_CONTEXT_FACTORY" value="com.sun.jndi.fscontext.RefFSContextFactory"/>
<property name="jdbcprofilestore.dir" value="$(PRODUCT.DIR)/qa/jdbc_profiles"/>
<property name="Context.PROVIDER_URL" value="file://$(PRODUCT.DIR)"/>
@@ -121,6 +123,7 @@
<node-configuration os="Linux_jdk15">
<properties>
+ <property name="ts.timeout.factor" value="1"/>
<property name="Context.INITIAL_CONTEXT_FACTORY" value="com.sun.jndi.fscontext.RefFSContextFactory"/>
<property name="jdbcprofilestore.dir" value="$(PRODUCT.DIR)/qa/jdbc_profiles"/>
<property name="Context.PROVIDER_URL" value="file://$(PRODUCT.DIR)"/>
@@ -157,6 +160,7 @@
<node-configuration os="RHEL4-32"><!-- RHEL4, x86: dtf1 -->
<properties>
+ <property name="ts.timeout.factor" value="1"/>
<property name="Context.INITIAL_CONTEXT_FACTORY" value="com.sun.jndi.fscontext.RefFSContextFactory"/>
<property name="jdbcprofilestore.dir" value="$(PRODUCT.DIR)/qa/jdbc_profiles/"/>
@@ -188,6 +192,7 @@
<node-configuration os="RHEL4-64"><!-- RHEL4, x86_64: dtf3 -->
<properties>
+ <property name="ts.timeout.factor" value="1"/>
<property name="Context.INITIAL_CONTEXT_FACTORY" value="com.sun.jndi.fscontext.RefFSContextFactory"/>
<property name="jdbcprofilestore.dir" value="$(PRODUCT.DIR)/qa/jdbc_profiles/"/>
@@ -218,6 +223,7 @@
</node-configuration>
<node-configuration os="RHEL5-32"><!-- RHEL5, x86: dtf2 -->
<properties>
+ <property name="ts.timeout.factor" value="1"/>
<property name="Context.INITIAL_CONTEXT_FACTORY" value="com.sun.jndi.fscontext.RefFSContextFactory"/>
<property name="jdbcprofilestore.dir" value="$(PRODUCT.DIR)/qa/jdbc_profiles/"/>
<property name="Context.PROVIDER_URL" value="file://$(PRODUCT.DIR)"/>
@@ -248,6 +254,7 @@
</node-configuration>
<node-configuration os="RHEL5-64"><!-- RHEL5, x86_64: dtf4 -->
<properties>
+ <property name="ts.timeout.factor" value="1"/>
<property name="Context.INITIAL_CONTEXT_FACTORY" value="com.sun.jndi.fscontext.RefFSContextFactory"/>
<property name="jdbcprofilestore.dir" value="$(PRODUCT.DIR)/qa/jdbc_profiles/"/>
<property name="Context.PROVIDER_URL" value="file://$(PRODUCT.DIR)"/>
@@ -278,6 +285,7 @@
<node-configuration os="SOL10-SPARC"><!-- Solaris 10 on SPARC: dtf7, dtf8 -->
<properties>
+ <property name="ts.timeout.factor" value="1"/>
<property name="Context.INITIAL_CONTEXT_FACTORY" value="com.sun.jndi.fscontext.RefFSContextFactory"/>
<property name="jdbcprofilestore.dir" value="$(PRODUCT.DIR)/qa/jdbc_profiles/"/>
<property name="Context.PROVIDER_URL" value="file://$(PRODUCT.DIR)"/>
@@ -308,6 +316,7 @@
<node-configuration os="HPUX11-IA64"><!-- HP-UX 11i on Itanium: dtf9, dtf10 -->
<properties>
+ <property name="ts.timeout.factor" value="1"/>
<property name="Context.INITIAL_CONTEXT_FACTORY" value="com.sun.jndi.fscontext.RefFSContextFactory"/>
<property name="jdbcprofilestore.dir" value="$(PRODUCT.DIR)/qa/jdbc_profiles/"/>
<property name="Context.PROVIDER_URL" value="file://$(PRODUCT.DIR)"/>
@@ -339,6 +348,7 @@
<node-configuration os="WIN2003-64"><!-- Windows 2003 Server on x86_64 -->
<properties>
+ <property name="ts.timeout.factor" value="1"/>
<property name="Context.INITIAL_CONTEXT_FACTORY" value="com.sun.jndi.fscontext.RefFSContextFactory"/>
<property name="jdbcprofilestore.dir" value="$(PRODUCT.DIR)/qa/jdbc_profiles/"/>
<property name="Context.PROVIDER_URL" value="file://$(PRODUCT.DIR)"/>
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Utils/qautil.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Utils/qautil.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/ArjunaCore/Utils/qautil.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -22,13 +22,39 @@
import com.arjuna.ats.arjuna.common.Uid;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import com.arjuna.ats.arjuna.common.arjPropertyManager;
import java.io.File;
public class qautil
{
+ private static double delayFactor = 0;
+
+ public static int getDelay(int milli) {
+ if (delayFactor <= 0) {
+ delayFactor = 1;
+
+ String delay = arjPropertyManager.propertyManager.getProperty(com.arjuna.ats.arjuna.common.Environment.FACTOR_SYS_PROP);
+
+ if (delay != null) {
+ try {
+ delayFactor = Double.parseDouble(delay);
+
+ if (delayFactor <= 0)
+ delayFactor = 1;
+ } catch (NumberFormatException e) {
+ }
+ }
+
+ System.out.println("Delay Factor is " + delayFactor);
+ }
+
+ return (int) (milli * delayFactor);
+ }
+
/**
* Default sleep behavior is to perform gc then sleep for 1 min (1000 milli seconds)
+ * This is a heavily used call but the sleep period is quite long so do not apply any delay factor
*/
public static void sleep()
{
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client02.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client02.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client02.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client02
{
@@ -95,7 +96,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client03.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client03.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client03.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client03
{
@@ -94,7 +95,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client04.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client04.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client04.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client04
{
@@ -94,7 +95,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client05.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client05.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client05.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client05
{
@@ -105,7 +106,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client06.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client06.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client06.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client06
{
@@ -105,7 +106,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client08.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client08.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client08.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client08
{
@@ -97,7 +98,7 @@
correct = service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client09.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client09.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client09.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client09
{
@@ -97,7 +98,7 @@
correct = service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client10.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client10.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client10.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client10
{
@@ -97,7 +98,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client11.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client11.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client11.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client11
{
@@ -107,7 +108,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client12.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client12.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client12.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client12
{
@@ -107,7 +108,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client14.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client14.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client14.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client14
{
@@ -102,7 +103,7 @@
correct = correct && service2.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service1.is_correct();
correct = correct && service2.is_correct();
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client15.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client15.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client15.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client15
{
@@ -102,7 +103,7 @@
correct = correct && service2.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service1.is_correct();
correct = correct && service2.is_correct();
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client16.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client16.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client16.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client16
{
@@ -102,7 +103,7 @@
correct = correct && service2.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service1.is_correct();
correct = correct && service2.is_correct();
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client17.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client17.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client17.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client17
{
@@ -111,7 +112,7 @@
correct = correct && service2.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service1.is_correct();
correct = correct && service2.is_correct();
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client18.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client18.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery01Clients/Client18.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client18
{
@@ -112,7 +113,7 @@
correct = correct && service2.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service1.is_correct();
correct = correct && service2.is_correct();
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Utils/Delays.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Utils/Delays.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Utils/Delays.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -30,11 +30,13 @@
//
package org.jboss.jbossts.qa.CrashRecovery02Utils;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Delays
{
- public static int replyCompletionDelay()
- {
- return 60 * 1000;
- }
+ public static int replyCompletionDelay()
+ {
+ return qautil.getDelay(60 * 1000);
+ }
}
+
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client02.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client02.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client02.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client02
{
@@ -95,7 +96,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client03.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client03.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client03.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client03
{
@@ -94,7 +95,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client04.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client04.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client04.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client04
{
@@ -94,7 +95,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client05.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client05.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client05.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client05
{
@@ -105,7 +106,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client06.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client06.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client06.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client06
{
@@ -105,7 +106,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client08.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client08.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client08.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client08
{
@@ -97,7 +98,7 @@
correct = service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client09.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client09.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client09.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client09
{
@@ -97,7 +98,7 @@
correct = service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client10.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client10.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client10.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client10
{
@@ -97,7 +98,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client11.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client11.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client11.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client11
{
@@ -107,7 +108,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client12.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client12.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client12.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client12
{
@@ -107,7 +108,7 @@
correct = correct && service.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service.is_correct();
// after reply_completion is called the resource will have rollback called on
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client14.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client14.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client14.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client14
{
@@ -102,7 +103,7 @@
correct = correct && service2.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service1.is_correct();
correct = correct && service2.is_correct();
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client15.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client15.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client15.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client15
{
@@ -102,7 +103,7 @@
correct = correct && service2.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service1.is_correct();
correct = correct && service2.is_correct();
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client16.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client16.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client16.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client16
{
@@ -102,7 +103,7 @@
correct = correct && service2.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service1.is_correct();
correct = correct && service2.is_correct();
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client17.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client17.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client17.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client17
{
@@ -112,7 +113,7 @@
correct = correct && service2.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service1.is_correct();
correct = correct && service2.is_correct();
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client18.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client18.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery04Clients/Client18.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -63,6 +63,7 @@
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Client18
{
@@ -112,7 +113,7 @@
correct = correct && service2.check_oper();
// now sleep to let reply completion do its job 1 second should be more than enough
- Thread.sleep(10 * 1000);
+ Thread.sleep(qautil.getDelay(10 * 1000));
correct = correct && service1.is_correct();
correct = correct && service2.is_correct();
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Utils/Delays.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Utils/Delays.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Utils/Delays.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -31,10 +31,12 @@
package org.jboss.jbossts.qa.CrashRecovery05Utils;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
+
public class Delays
{
public static int replyCompletionDelay()
{
- return 60 * 1000;
+ return qautil.getDelay(60 * 1000);
}
}
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery07Utils/Delays.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery07Utils/Delays.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery07Utils/Delays.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -31,15 +31,17 @@
package org.jboss.jbossts.qa.CrashRecovery07Utils;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
+
public class Delays
{
public static int recoveryDelay()
{
- return 90 * 1000;
+ return qautil.getDelay(90 * 1000);
}
public static int recoveryDelay(int num_clients)
{
- return (90 * 1000) + (90 * 1000 * num_clients);
+ return qautil.getDelay(90 * 1000 * (num_clients + 1));
}
}
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery08Utils/Delays.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery08Utils/Delays.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery08Utils/Delays.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -30,16 +30,17 @@
//
package org.jboss.jbossts.qa.CrashRecovery08Utils;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Delays
{
public static int recoveryDelay()
{
- return 120 * 1000;
+ return qautil.getDelay(120 * 1000);
}
public static int recoveryDelay(int num_clients)
{
- return (120 * 1000) + (120 * 1000 * num_clients);
+ return qautil.getDelay(120 * 1000 * (num_clients + 1));
}
}
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Utils/Delays.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Utils/Delays.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Utils/Delays.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -31,10 +31,12 @@
package org.jboss.jbossts.qa.CrashRecovery09Utils;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
+
public class Delays
{
public static int recoveryDelay()
{
- return 60 * 1000;
+ return qautil.getDelay(60 * 1000);
}
}
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Utils/Delays.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Utils/Delays.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Utils/Delays.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -31,10 +31,12 @@
package org.jboss.jbossts.qa.CrashRecovery10Utils;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
+
public class Delays
{
public static int recoveryDelay()
{
- return 60 * 1000;
+ return qautil.getDelay(60 * 1000);
}
}
Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery11Utils/Delays.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery11Utils/Delays.java 2012-09-13 02:07:25 UTC (rev 38176)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery11Utils/Delays.java 2012-09-13 12:22:30 UTC (rev 38177)
@@ -33,6 +33,7 @@
import com.arjuna.ats.arjuna.common.Environment;
import com.arjuna.ats.arjuna.common.arjPropertyManager;
+import org.jboss.jbossts.qa.ArjunaCore.Utils.qautil;
public class Delays
{
@@ -52,11 +53,12 @@
Integer backoffPeriodInteger = new Integer(backoffPeriodString);
int _backoffPeriod = backoffPeriodInteger.intValue();
- return (_backoffPeriod + _recoveryPeriod + (5 * 1000) /*5 secs for processing*/);
+ /*add 5 secs for processing*/
+ return qautil.getDelay((_backoffPeriod + _recoveryPeriod + (5 * 1000));
}
catch (NumberFormatException e)
{
- return 30 * 1000;
+ return qautil.getDelay(30 * 1000);
}
}
}
More information about the jboss-svn-commits
mailing list