[jboss-svn-commits] JBL Code SVN: r30130 - in labs/jbosstm/trunk/qa: tests/src and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 12 07:00:21 EST 2009
Author: jhalliday
Date: 2009-11-12 07:00:20 -0500 (Thu, 12 Nov 2009)
New Revision: 30130
Removed:
labs/jbosstm/trunk/qa/tests/src/com/
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery02Utils/
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery05Utils/
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Utils/
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Utils/
Modified:
labs/jbosstm/trunk/qa/run-tests.xml
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client01a.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client02a.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client03a.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client04a.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client01a.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client02a.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client03a.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client04a.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java
Log:
Reconfigure crash rec test delays. JBTM-390
Modified: labs/jbosstm/trunk/qa/run-tests.xml
===================================================================
--- labs/jbosstm/trunk/qa/run-tests.xml 2009-11-12 11:58:59 UTC (rev 30129)
+++ labs/jbosstm/trunk/qa/run-tests.xml 2009-11-12 12:00:20 UTC (rev 30130)
@@ -145,9 +145,9 @@
<antcall target="junit-tests"><param name="tests" value="crashrecovery07"/></antcall>
<!-- crashrecovery08 : 32 tests, 32 minutes -->
<antcall target="junit-tests"><param name="tests" value="crashrecovery08"/></antcall>
- <!-- crashrecovery09 : 6 tests, 7 minutes -->
+ <!-- crashrecovery09 : 6 tests, 4 minutes -->
<antcall target="junit-tests"><param name="tests" value="crashrecovery09"/></antcall>
- <!-- crashrecovery10 : 6 tests, 7 minutes -->
+ <!-- crashrecovery10 : 6 tests, 4 minutes -->
<antcall target="junit-tests"><param name="tests" value="crashrecovery10"/></antcall>
<!-- crashrecovery12 : 7 tests, 5 minutes -->
<antcall target="junit-tests"><param name="tests" value="crashrecovery12"/></antcall>
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client01a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client01a.java 2009-11-12 11:58:59 UTC (rev 30129)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client01a.java 2009-11-12 12:00:20 UTC (rev 30130)
@@ -58,11 +58,7 @@
import org.jboss.jbossts.qa.CrashRecovery09.*;
-import org.jboss.jbossts.qa.CrashRecovery09Utils.Delays;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-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.Utils.*;
import org.omg.CORBA.IntHolder;
public class Client01a
@@ -77,7 +73,7 @@
String serviceIOR = ServerIORStore.loadIOR(args[args.length - 1]);
Service service = ServiceHelper.narrow(ORBInterface.orb().string_to_object(serviceIOR));
- Thread.sleep(Delays.recoveryDelay());
+ CrashRecoveryDelays.awaitRecoveryCR09();
boolean correct = true;
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client02a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client02a.java 2009-11-12 11:58:59 UTC (rev 30129)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client02a.java 2009-11-12 12:00:20 UTC (rev 30130)
@@ -58,11 +58,7 @@
import org.jboss.jbossts.qa.CrashRecovery09.*;
-import org.jboss.jbossts.qa.CrashRecovery09Utils.Delays;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-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.Utils.*;
import org.omg.CORBA.IntHolder;
public class Client02a
@@ -77,7 +73,7 @@
String serviceIOR = ServerIORStore.loadIOR(args[args.length - 1]);
Service service = ServiceHelper.narrow(ORBInterface.orb().string_to_object(serviceIOR));
- Thread.sleep(Delays.recoveryDelay());
+ CrashRecoveryDelays.awaitRecoveryCR09();
boolean correct = true;
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client03a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client03a.java 2009-11-12 11:58:59 UTC (rev 30129)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client03a.java 2009-11-12 12:00:20 UTC (rev 30130)
@@ -58,11 +58,7 @@
import org.jboss.jbossts.qa.CrashRecovery09.*;
-import org.jboss.jbossts.qa.CrashRecovery09Utils.Delays;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-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.Utils.*;
import org.omg.CORBA.IntHolder;
public class Client03a
@@ -80,7 +76,7 @@
String serviceIOR2 = ServerIORStore.loadIOR(args[args.length - 1]);
Service service2 = ServiceHelper.narrow(ORBInterface.orb().string_to_object(serviceIOR2));
- Thread.sleep(Delays.recoveryDelay());
+ CrashRecoveryDelays.awaitRecoveryCR09();
boolean correct = true;
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client04a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client04a.java 2009-11-12 11:58:59 UTC (rev 30129)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery09Clients/Client04a.java 2009-11-12 12:00:20 UTC (rev 30130)
@@ -58,11 +58,7 @@
import org.jboss.jbossts.qa.CrashRecovery09.*;
-import org.jboss.jbossts.qa.CrashRecovery09Utils.Delays;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-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.Utils.*;
import org.omg.CORBA.IntHolder;
public class Client04a
@@ -80,7 +76,7 @@
String serviceIOR2 = ServerIORStore.loadIOR(args[args.length - 1]);
Service service2 = ServiceHelper.narrow(ORBInterface.orb().string_to_object(serviceIOR2));
- Thread.sleep(Delays.recoveryDelay());
+ CrashRecoveryDelays.awaitRecoveryCR09();
boolean correct = true;
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client01a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client01a.java 2009-11-12 11:58:59 UTC (rev 30129)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client01a.java 2009-11-12 12:00:20 UTC (rev 30130)
@@ -58,11 +58,7 @@
import org.jboss.jbossts.qa.CrashRecovery10.*;
-import org.jboss.jbossts.qa.CrashRecovery10Utils.Delays;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-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.Utils.*;
import org.omg.CORBA.IntHolder;
public class Client01a
@@ -77,7 +73,7 @@
String serviceIOR = ServerIORStore.loadIOR(args[args.length - 1]);
Service service = ServiceHelper.narrow(ORBInterface.orb().string_to_object(serviceIOR));
- Thread.sleep(Delays.recoveryDelay());
+ CrashRecoveryDelays.awaitRecoveryCR10();
boolean correct = true;
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client02a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client02a.java 2009-11-12 11:58:59 UTC (rev 30129)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client02a.java 2009-11-12 12:00:20 UTC (rev 30130)
@@ -58,11 +58,7 @@
import org.jboss.jbossts.qa.CrashRecovery10.*;
-import org.jboss.jbossts.qa.CrashRecovery10Utils.Delays;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-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.Utils.*;
import org.omg.CORBA.IntHolder;
public class Client02a
@@ -77,7 +73,7 @@
String serviceIOR = ServerIORStore.loadIOR(args[args.length - 1]);
Service service = ServiceHelper.narrow(ORBInterface.orb().string_to_object(serviceIOR));
- Thread.sleep(Delays.recoveryDelay());
+ CrashRecoveryDelays.awaitRecoveryCR10();
boolean correct = true;
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client03a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client03a.java 2009-11-12 11:58:59 UTC (rev 30129)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client03a.java 2009-11-12 12:00:20 UTC (rev 30130)
@@ -58,11 +58,7 @@
import org.jboss.jbossts.qa.CrashRecovery10.*;
-import org.jboss.jbossts.qa.CrashRecovery10Utils.Delays;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-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.Utils.*;
import org.omg.CORBA.IntHolder;
public class Client03a
@@ -80,7 +76,7 @@
String serviceIOR2 = ServerIORStore.loadIOR(args[args.length - 1]);
Service service2 = ServiceHelper.narrow(ORBInterface.orb().string_to_object(serviceIOR2));
- Thread.sleep(Delays.recoveryDelay());
+ CrashRecoveryDelays.awaitRecoveryCR10();
boolean correct = true;
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client04a.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client04a.java 2009-11-12 11:58:59 UTC (rev 30129)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CrashRecovery10Clients/Client04a.java 2009-11-12 12:00:20 UTC (rev 30130)
@@ -58,11 +58,7 @@
import org.jboss.jbossts.qa.CrashRecovery10.*;
-import org.jboss.jbossts.qa.CrashRecovery10Utils.Delays;
-import org.jboss.jbossts.qa.Utils.OAInterface;
-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.Utils.*;
import org.omg.CORBA.IntHolder;
public class Client04a
@@ -80,7 +76,7 @@
String serviceIOR2 = ServerIORStore.loadIOR(args[args.length - 1]);
Service service2 = ServiceHelper.narrow(ORBInterface.orb().string_to_object(serviceIOR2));
- Thread.sleep(Delays.recoveryDelay());
+ CrashRecoveryDelays.awaitRecoveryCR10();
boolean correct = true;
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java 2009-11-12 11:58:59 UTC (rev 30129)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/CrashRecoveryDelays.java 2009-11-12 12:00:20 UTC (rev 30130)
@@ -39,6 +39,14 @@
awaitRecovery(2, num_clients);
}
+ public static void awaitRecoveryCR09() throws InterruptedException {
+ awaitRecovery(1, 1);
+ }
+
+ public static void awaitRecoveryCR10() throws InterruptedException {
+ awaitRecovery(1, 1);
+ }
+
private static void awaitRecovery(int num_cycles, int num_clients) throws InterruptedException
{
// Note: this assumes the client is running with the same config as the rec mgr process.
More information about the jboss-svn-commits
mailing list