Increase timeout for waiting for broker service in sal-binding-it. 81/4881/1
authorTomas Olvecky <tolvecky@cisco.com>
Mon, 27 Jan 2014 13:41:45 +0000 (14:41 +0100)
committerTomas Olvecky <tolvecky@cisco.com>
Mon, 27 Jan 2014 13:41:45 +0000 (14:41 +0100)
Increase timer from 1min to 2mins because tests in sal-binding-it are not stable on ODL jenkins.

Change-Id: Ibd43d5258c5957c60ad0619ef23aec378963151d
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java

index bf1b169759badd386bc7715d4d259a0b6aae34b9..a19d2ed76bd3dd9e578829d86d8bcb49ab8c5fb5 100644 (file)
@@ -1,20 +1,25 @@
 package org.opendaylight.controller.test.sal.binding.it;
 
-import static org.ops4j.pax.exam.CoreOptions.*;
-import static org.opendaylight.controller.test.sal.binding.it.TestHelper.*;
-
-import javax.inject.Inject;
-
 import org.junit.runner.RunWith;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.options.DefaultCompositeOption;
 import org.ops4j.pax.exam.util.Filter;
-import org.ops4j.pax.exam.util.PathUtils;
 import org.osgi.framework.BundleContext;
 
+import javax.inject.Inject;
+
+import static org.opendaylight.controller.test.sal.binding.it.TestHelper.baseModelBundles;
+import static org.opendaylight.controller.test.sal.binding.it.TestHelper.bindingAwareSalBundles;
+import static org.opendaylight.controller.test.sal.binding.it.TestHelper.configMinumumBundles;
+import static org.opendaylight.controller.test.sal.binding.it.TestHelper.flowCapableModelBundles;
+import static org.opendaylight.controller.test.sal.binding.it.TestHelper.junitAndMockitoBundles;
+import static org.opendaylight.controller.test.sal.binding.it.TestHelper.mdSalCoreBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+
 @RunWith(PaxExam.class)
 public abstract class AbstractTest {
 
@@ -25,7 +30,7 @@ public abstract class AbstractTest {
     public static final String YANGTOOLS_MODELS = "org.opendaylight.yangtools.model";
 
     @Inject
-    @Filter(timeout=60*1000)
+    @Filter(timeout=120*1000)
     BindingAwareBroker broker;
 
     @Inject