From: Mathieu Baudier Date: Thu, 4 Jun 2009 17:48:50 +0000 (+0000) Subject: Reduce timeout X-Git-Tag: argeo-slc-2.1.7~1855 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=9fc0c57f44fd0f8cfa178a21f210c1971153fca8;p=gpl%2Fargeo-slc.git Reduce timeout git-svn-id: https://svn.argeo.org/slc/trunk@2471 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/AbstractOsgiRuntimeTestCase.java b/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/AbstractOsgiRuntimeTestCase.java index 88c9f1af5..36a0da9f4 100644 --- a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/AbstractOsgiRuntimeTestCase.java +++ b/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/AbstractOsgiRuntimeTestCase.java @@ -127,12 +127,11 @@ public abstract class AbstractOsgiRuntimeTestCase extends TestCase { if (bundlesToStart.contains(bundle.getSymbolicName()) && bundle.getState() != Bundle.ACTIVE) { allBundlesOk = false; - badBundles - .append(OsgiStringUtils - .nullSafeSymbolicName(bundle) - + " [" - + OsgiStringUtils - .bundleStateAsString(bundle) + "]\n"); + badBundles.append(OsgiStringUtils + .nullSafeSymbolicName(bundle) + + " [" + + OsgiStringUtils.bundleStateAsString(bundle) + + "]\n"); } } @@ -213,9 +212,9 @@ public abstract class AbstractOsgiRuntimeTestCase extends TestCase { return osgiBoot.getBundleContext(); } - /** Default is 120s */ + /** Default is 30s */ protected long getResolvedTimeout() { - return 120 * 1000l; + return 30 * 1000l; } /** Default is 10s */