You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2010/10/13 23:31:13 UTC
svn commit: r1022298 - in /incubator/aries/trunk:
application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/
blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/
blueprint/blueprint-itests...
Author: jbohn
Date: Wed Oct 13 21:31:13 2010
New Revision: 1022298
URL: http://svn.apache.org/viewvc?rev=1022298&view=rev
Log:
increase default timeouts for tests in hopes that there will be fewer service timeouts on slower machines
Modified:
incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java
incubator/aries/trunk/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java
incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPATest.java
incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java
incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractIntegrationTest.java
incubator/aries/trunk/spi-fly/spi-fly-itests/src/test/java/org/apache/aries/spifly/AbstractIntegrationTest.java
incubator/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java
Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java Wed Oct 13 21:31:13 2010
@@ -43,7 +43,7 @@ import org.osgi.util.tracker.ServiceTrac
@RunWith(JUnit4TestRunner.class)
public class AbstractIntegrationTest {
- public static final long DEFAULT_TIMEOUT = 30000;
+ public static final long DEFAULT_TIMEOUT = 60000;
@Inject
protected BundleContext bundleContext;
Modified: incubator/aries/trunk/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-annotation-itest/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java Wed Oct 13 21:31:13 2010
@@ -56,7 +56,7 @@ import org.osgi.util.tracker.ServiceTrac
public abstract class AbstractIntegrationTest {
- public static final long DEFAULT_TIMEOUT = 30000;
+ public static final long DEFAULT_TIMEOUT = 60000;
private List<ServiceTracker> srs;
Modified: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractIntegrationTest.java Wed Oct 13 21:31:13 2010
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertTru
import static org.junit.Assert.fail;
import java.io.*;
-import java.net.URISyntaxException;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -58,7 +57,7 @@ import org.osgi.util.tracker.ServiceTrac
public abstract class AbstractIntegrationTest {
- public static final long DEFAULT_TIMEOUT = 30000;
+ public static final long DEFAULT_TIMEOUT = 60000;
private List<ServiceTracker> srs;
@@ -230,7 +229,7 @@ public abstract class AbstractIntegratio
protected void testBlueprintContainer(BundleContext bc, Bundle bundle) throws Exception {
BlueprintContainer blueprintContainer = getBlueprintContainerForBundle(
bc == null ? bundleContext : bc, "org.apache.aries.blueprint.sample",
- 5000);
+ DEFAULT_TIMEOUT);
assertNotNull(blueprintContainer);
Object obj = blueprintContainer.getComponentInstance("bar");
@@ -257,7 +256,7 @@ public abstract class AbstractIntegratio
assertTrue(foo.isInitialized());
assertFalse(foo.isDestroyed());
- obj = getOsgiService(bc == null ? bundleContext : bc, Foo.class, null, 5000);
+ obj = getOsgiService(bc == null ? bundleContext : bc, Foo.class, null, DEFAULT_TIMEOUT);
assertNotNull(obj);
assertEquals(obj, foo);
Modified: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractMultiBundleTest.java Wed Oct 13 21:31:13 2010
@@ -94,7 +94,7 @@ public class AbstractMultiBundleTest ext
//bundleb's container will hold the beans we need to query to check the function
//provided by bundlea functioned as expected
BlueprintContainer beanContainer =
- getBlueprintContainerForBundle( bundleContext , "org.apache.aries.blueprint.testbundleb", 5000);
+ getBlueprintContainerForBundle( bundleContext , "org.apache.aries.blueprint.testbundleb", DEFAULT_TIMEOUT);
assertNotNull(beanContainer);
//TestBeanA should have the values below, no interference should be present from other sources.
@@ -122,7 +122,7 @@ public class AbstractMultiBundleTest ext
//handlers are in bundlea, with its own container.
BlueprintContainer handlerContainer =
- getBlueprintContainerForBundle( bundleContext , "org.apache.aries.blueprint.testbundlea", 5000);
+ getBlueprintContainerForBundle( bundleContext , "org.apache.aries.blueprint.testbundlea", DEFAULT_TIMEOUT);
assertNotNull(handlerContainer);
Object ns1 = handlerContainer.getComponentInstance("NSHandlerOne");
Modified: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java Wed Oct 13 21:31:13 2010
@@ -74,7 +74,7 @@ public class BlueprintContainerTest exte
bundle.start();
- getBlueprintContainerForBundle(bundleContext, "org.apache.aries.blueprint.sample",5000);
+ getBlueprintContainerForBundle(bundleContext, "org.apache.aries.blueprint.sample",DEFAULT_TIMEOUT);
// no actual assertions, we just don't want to deadlock
}
Modified: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java Wed Oct 13 21:31:13 2010
@@ -68,8 +68,6 @@ public class QuiesceBlueprintTest extend
return calls;
}
}
-
- private static final int DEFAULT_TIMEOUT = 30000;
@Inject
protected BundleContext bundleContext;
Modified: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java Wed Oct 13 21:31:13 2010
@@ -53,7 +53,7 @@ public class TestConfigAdmin extends Abs
assertNotNull(bundle);
bundle.start();
- BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.aries.blueprint.sample", 5000);
+ BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.aries.blueprint.sample", DEFAULT_TIMEOUT);
assertNotNull(blueprintContainer);
Foo foo = (Foo) blueprintContainer.getComponentInstance("none-managed");
@@ -87,7 +87,7 @@ public class TestConfigAdmin extends Abs
assertNotNull(bundle);
bundle.start();
- BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.aries.blueprint.sample", 5000);
+ BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.aries.blueprint.sample", DEFAULT_TIMEOUT);
assertNotNull(blueprintContainer);
Foo foo = (Foo) blueprintContainer.getComponentInstance("container-managed");
@@ -120,7 +120,7 @@ public class TestConfigAdmin extends Abs
assertNotNull(bundle);
bundle.start();
- BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.aries.blueprint.sample", 5000);
+ BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.aries.blueprint.sample", DEFAULT_TIMEOUT);
assertNotNull(blueprintContainer);
Foo foo = (Foo) blueprintContainer.getComponentInstance("component-managed");
@@ -156,7 +156,7 @@ public class TestConfigAdmin extends Abs
assertNotNull(bundle);
bundle.start();
- BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.aries.blueprint.sample", 5000);
+ BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.aries.blueprint.sample", DEFAULT_TIMEOUT);
assertNotNull(blueprintContainer);
Thread.sleep(5000);
Modified: incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java (original)
+++ incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java Wed Oct 13 21:31:13 2010
@@ -62,7 +62,7 @@ import org.osgi.util.tracker.ServiceTrac
@RunWith(JUnit4TestRunner.class)
public class AbstractIntegrationTest {
- public static final long DEFAULT_TIMEOUT = 30000;
+ public static final long DEFAULT_TIMEOUT = 60000;
ServiceRegistration registration;
ServiceReference reference;
Modified: incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java (original)
+++ incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java Wed Oct 13 21:31:13 2010
@@ -42,7 +42,7 @@ import org.osgi.util.tracker.ServiceTrac
@RunWith(JUnit4TestRunner.class)
public class JPAInjectionTest {
- public static final long DEFAULT_TIMEOUT = 30000;
+ public static final long DEFAULT_TIMEOUT = 60000;
@Inject
protected BundleContext bundleContext;
Modified: incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java (original)
+++ incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java Wed Oct 13 21:31:13 2010
@@ -49,7 +49,7 @@ import org.osgi.util.tracker.ServiceTrac
@RunWith(JUnit4TestRunner.class)
public class JPAContainerTest {
- public static final long DEFAULT_TIMEOUT = 30000;
+ public static final long DEFAULT_TIMEOUT = 60000;
@Inject
protected BundleContext bundleContext;
Modified: incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java (original)
+++ incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java Wed Oct 13 21:31:13 2010
@@ -51,7 +51,7 @@ import org.osgi.util.tracker.ServiceTrac
@RunWith(JUnit4TestRunner.class)
public class JPAContextTest {
- public static final long DEFAULT_TIMEOUT = 30000;
+ public static final long DEFAULT_TIMEOUT = 60000;
@Inject
protected BundleContext bundleContext;
Modified: incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPATest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPATest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPATest.java (original)
+++ incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPATest.java Wed Oct 13 21:31:13 2010
@@ -106,7 +106,7 @@ public class QuiesceJPATest {
}
- public static final long DEFAULT_TIMEOUT = 30000;
+ public static final long DEFAULT_TIMEOUT = 60000;
@Inject
protected BundleContext bundleContext;
Modified: incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java (original)
+++ incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java Wed Oct 13 21:31:13 2010
@@ -21,6 +21,8 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import static org.ops4j.pax.exam.OptionUtils.combine;
+//import org.ops4j.pax.exam.container.def.options.VMOption;
+//import org.ops4j.pax.exam.options.TimeoutOption
import java.util.ArrayList;
import java.util.Arrays;
@@ -53,7 +55,7 @@ import org.osgi.util.tracker.ServiceTrac
@RunWith(JUnit4TestRunner.class)
public class QuiesceManagerTest {
- public static final long DEFAULT_TIMEOUT = 30000;
+ public static final long DEFAULT_TIMEOUT = 60000;
private QuiesceManager manager;
private Bundle b1;
private Bundle b2;
@@ -310,6 +312,9 @@ public class QuiesceManagerTest {
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp"),
mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api"),
mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.manager"),
+
+ //new VMOption( "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" ),
+ //new TimeoutOption( 0 ),
equinox().version("3.5.0"));
options = updateOptions(options);
Modified: incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractIntegrationTest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractIntegrationTest.java (original)
+++ incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractIntegrationTest.java Wed Oct 13 21:31:13 2010
@@ -55,7 +55,7 @@ import org.osgi.util.tracker.ServiceTrac
public abstract class AbstractIntegrationTest {
private static final int CONNECTION_TIMEOUT = 30000;
- public static final long DEFAULT_TIMEOUT = 30000;
+ public static final long DEFAULT_TIMEOUT = 60000;
@Inject
protected BundleContext bundleContext;
Modified: incubator/aries/trunk/spi-fly/spi-fly-itests/src/test/java/org/apache/aries/spifly/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/spi-fly/spi-fly-itests/src/test/java/org/apache/aries/spifly/AbstractIntegrationTest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/spi-fly/spi-fly-itests/src/test/java/org/apache/aries/spifly/AbstractIntegrationTest.java (original)
+++ incubator/aries/trunk/spi-fly/spi-fly-itests/src/test/java/org/apache/aries/spifly/AbstractIntegrationTest.java Wed Oct 13 21:31:13 2010
@@ -43,7 +43,7 @@ import org.osgi.util.tracker.ServiceTrac
@RunWith(JUnit4TestRunner.class)
public class AbstractIntegrationTest {
- public static final long DEFAULT_TIMEOUT = 30000;
+ public static final long DEFAULT_TIMEOUT = 60000;
@Inject
protected BundleContext bundleContext;
Modified: incubator/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java (original)
+++ incubator/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java Wed Oct 13 21:31:13 2010
@@ -25,6 +25,9 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
+import org.ops4j.pax.exam.container.def.options.VMOption;
+import org.ops4j.pax.exam.options.TimeoutOption;
+
import java.util.ArrayList;
import java.util.List;
@@ -49,7 +52,8 @@ import org.osgi.util.tracker.ServiceTrac
@RunWith(JUnit4TestRunner.class)
public abstract class AbstractIntegrationTest {
- public static final long DEFAULT_TIMEOUT = 30000;
+ public static final long DEFAULT_TIMEOUT = 60000;
+// public static final long DEFAULT_TIMEOUT = 0;
private List<ServiceTracker> srs;
Modified: incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java?rev=1022298&r1=1022297&r2=1022298&view=diff
==============================================================================
--- incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java (original)
+++ incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java Wed Oct 13 21:31:13 2010
@@ -57,7 +57,7 @@ import org.osgi.util.tracker.ServiceTrac
@RunWith(JUnit4TestRunner.class)
public class WabConverterITest {
- public static final long DEFAULT_TIMEOUT = 30000;
+ public static final long DEFAULT_TIMEOUT = 60000;
@Inject
protected BundleContext bundleContext;