You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2013/11/28 18:43:09 UTC
svn commit: r1546404 - in /tomee/tomee/trunk/itests:
failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
Author: tveronezi
Date: Thu Nov 28 17:43:08 2013
New Revision: 1546404
URL: http://svn.apache.org/r1546404
Log:
increasing CLIENT_DELAY value, otherwise test may fail in slower machines.
Modified:
tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
tomee/tomee/trunk/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
Modified: tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java?rev=1546404&r1=1546403&r2=1546404&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java (original)
+++ tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/RandomConnectionStrategyTest.java Thu Nov 28 17:43:08 2013
@@ -55,6 +55,8 @@ public class RandomConnectionStrategyTes
static final Logger logger = Logger.getLogger("org.apache.openejb.client");
+ private static final int CLIENT_DELAY = 60;
+
static {
final ConsoleHandler consoleHandler = new ConsoleHandler();
consoleHandler.setLevel(Level.FINER);
@@ -165,7 +167,7 @@ public class RandomConnectionStrategyTes
final URI serverURI = server.getContext().get(URI.class);
logger.info("Waiting for updated list");
- services.assertServices(30, TimeUnit.SECONDS, new CalculatorCallable(bean), 500);
+ services.assertServices(CLIENT_DELAY, TimeUnit.SECONDS, new CalculatorCallable(bean), 500);
logger.info("Asserting balance");
assertBalance(bean, services.get().size());
@@ -199,7 +201,7 @@ public class RandomConnectionStrategyTes
services.add(serverURI);
logger.info("Waiting for updated list");
- services.assertServices(30, TimeUnit.SECONDS, new CalculatorCallable(bean), 500);
+ services.assertServices(CLIENT_DELAY, TimeUnit.SECONDS, new CalculatorCallable(bean), 500);
logger.info("Asserting balance");
assertBalance(bean, services.get().size());
@@ -233,8 +235,8 @@ public class RandomConnectionStrategyTes
if (!invocations.containsKey(name)) {
invocations.put(name, new AtomicInteger());
+ logger.info(String.format("Tracking new Server %s", name));
}
-
invocations.get(name).incrementAndGet();
}
Modified: tomee/tomee/trunk/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java?rev=1546404&r1=1546403&r2=1546404&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java (original)
+++ tomee/tomee/trunk/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java Thu Nov 28 17:43:08 2013
@@ -55,6 +55,8 @@ public class LegacyServerTest {
static final Logger logger = Logger.getLogger("org.apache.openejb.client");
+ private static final int CLIENT_DELAY = 60;
+
static {
final ConsoleHandler consoleHandler = new ConsoleHandler();
consoleHandler.setLevel(Level.FINER);
@@ -98,7 +100,8 @@ public class LegacyServerTest {
multipoint.set("discoveryName", name);
logger.info("Starting Root server");
- root.start();
+ // Wait for it to start before continuing, otherwise test may fail in slower machines.
+ root.start(1, TimeUnit.MINUTES);
}
final Services services = new Services();
@@ -163,7 +166,7 @@ public class LegacyServerTest {
final URI serverURI = server.getContext().get(URI.class);
logger.info("Waiting for updated list");
- services.assertServices(30, TimeUnit.SECONDS, new CalculatorCallable(bean), 500);
+ services.assertServices(CLIENT_DELAY, TimeUnit.SECONDS, new CalculatorCallable(bean), 500);
logger.info("Asserting balance");
assertBalance(bean, services.get().size());
@@ -196,7 +199,7 @@ public class LegacyServerTest {
services.add(serverURI);
logger.info("Waiting for updated list");
- services.assertServices(30, TimeUnit.SECONDS, new CalculatorCallable(bean), 500);
+ services.assertServices(CLIENT_DELAY, TimeUnit.SECONDS, new CalculatorCallable(bean), 500);
logger.info("Asserting balance");
assertBalance(bean, services.get().size());
@@ -210,8 +213,7 @@ public class LegacyServerTest {
// Verify the work reached all servers
final Set<Map.Entry<String, AtomicInteger>> entries = invoke(bean, totalInvocations).entrySet();
-
- Assert.assertEquals(size, entries.size());
+ Assert.assertEquals("Bad number of invocations for the bean \"" + bean.name() + "\".", size, entries.size());
// And each server got a minimum of %10 percent of the traffic
for (final Map.Entry<String, AtomicInteger> entry : entries) {
@@ -229,6 +231,7 @@ public class LegacyServerTest {
if (!invocations.containsKey(name)) {
invocations.put(name, new AtomicInteger());
+ logger.info(String.format("Tracking new Server %s", name));
}
invocations.get(name).incrementAndGet();