Merge "Increase timeout for waiting for broker service in sal-binding-it."
authorEd Warnicke <eaw@cisco.com>
Fri, 7 Feb 2014 06:35:34 +0000 (06:35 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 7 Feb 2014 06:35:34 +0000 (06:35 +0000)
1  2 
opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java

index cd4f8f158d46316f92a860249d2968874041bfd0,a19d2ed76bd3dd9e578829d86d8bcb49ab8c5fb5..9ac94e7b8904a3148128ca0f01f6b7d6a72fa5d0
@@@ -1,17 -1,5 +1,12 @@@
 +/*
 + * 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;