Merge "Increase timeout for waiting for broker service in sal-binding-it."

diff --combined opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java
index cd4f8f158d46316f92a860249d2968874041bfd0,a19d2ed76bd3dd9e578829d86d8bcb49ab8c5fb5..9ac94e7b8904a3148128ca0f01f6b7d6a72fa5d0
--- 1/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java
--- 2/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java
+++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java
@@@ -1,27 -1,25 +1,32 @@@
 +/*
 + * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
 + *
 + * This program and the accompanying materials are made available under the
 + * terms of the Eclipse Public License v1.0 which accompanies this distribution,
 + * and is available at http://www.eclipse.org/legal/epl-v10.html
 + */
  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 {
  
@@@ -32,7 -30,7 +37,7 @@@
      public static final String YANGTOOLS_MODELS = "org.opendaylight.yangtools.model";
  
      @Inject
-     @Filter(timeout=60*1000)
+     @Filter(timeout=120*1000)
      BindingAwareBroker broker;
  
      @Inject