From dd16d3dac28179ff681e686a48fedbb5ae8cd64f Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Thu, 23 Apr 2015 11:38:13 +0200 Subject: [PATCH] Switched sal-binding-it to use failsafe. sal-binding-it contained only integration tests which should be run using failsafe instead of surefire. This tests are sensitive to available performance and sometimes may timeout if not enough CPU power is availble thus marking them as optional instead of dissabling them at all. Change-Id: Iea8a7f093892587e707d6eccaf29311878a721fd Signed-off-by: Tony Tkacik --- opendaylight/md-sal/sal-binding-it/pom.xml | 24 +++++++++++++ .../it/{AbstractTest.java => AbstractIT.java} | 34 ++++++++----------- ...ataServiceTest.java => DataServiceIT.java} | 2 +- ...ificationTest.java => NotificationIT.java} | 4 +-- ...dServiceTest.java => RoutedServiceIT.java} | 4 +-- .../src/test/resources/logback.xml | 10 +++--- 6 files changed, 50 insertions(+), 28 deletions(-) rename opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/{AbstractTest.java => AbstractIT.java} (90%) rename opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/{DataServiceTest.java => DataServiceIT.java} (98%) rename opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/{NotificationTest.java => NotificationIT.java} (98%) rename opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/{RoutedServiceTest.java => RoutedServiceIT.java} (98%) diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml index 31bcbfd008..6abe5de626 100644 --- a/opendaylight/md-sal/sal-binding-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-it/pom.xml @@ -182,6 +182,30 @@ + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + + true + + diff --git a/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/AbstractIT.java similarity index 90% rename from opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractTest.java rename to opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractIT.java index 2075ba4421..5bba4deee8 100644 --- a/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/AbstractIT.java @@ -7,29 +7,28 @@ */ package org.opendaylight.controller.test.sal.binding.it; -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.util.Filter; -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.salTestModelBundles; 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.opendaylight.controller.test.sal.binding.it.TestHelper.salTestModelBundles; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.options; import static org.ops4j.pax.exam.CoreOptions.systemPackages; import static org.ops4j.pax.exam.CoreOptions.systemProperty; +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.util.Filter; +import org.osgi.framework.BundleContext; + @RunWith(PaxExam.class) -public abstract class AbstractTest { +public abstract class AbstractIT { public static final String CONTROLLER = "org.opendaylight.controller"; public static final String YANGTOOLS = "org.opendaylight.yangtools"; @@ -48,7 +47,7 @@ public abstract class AbstractTest { return broker; } - public void setBroker(BindingAwareBroker broker) { + public void setBroker(final BindingAwareBroker broker) { this.broker = broker; } @@ -56,7 +55,7 @@ public abstract class AbstractTest { return bundleContext; } - public void setBundleContext(BundleContext bundleContext) { + public void setBundleContext(final BundleContext bundleContext) { this.bundleContext = bundleContext; } @@ -64,9 +63,6 @@ public abstract class AbstractTest { public Option[] config() { return options(systemProperty("osgi.console").value("2401"), mavenBundle("org.slf4j", "slf4j-api") .versionAsInProject(), // -// systemProperty("logback.configurationFile").value( -// "file:" + PathUtils.getBaseDir() -// + "/src/test/resources/logback.xml"), mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject(), // mavenBundle("ch.qos.logback", "logback-core").versionAsInProject(), // mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject(), @@ -77,9 +73,9 @@ public abstract class AbstractTest { systemPackages("sun.nio.ch"), mdSalCoreBundles(), - - bindingAwareSalBundles(), configMinumumBundles(), + bindingAwareSalBundles(), + // BASE Models baseModelBundles(), salTestModelBundles(), diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceTest.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceIT.java similarity index 98% rename from opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceTest.java rename to opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceIT.java index 853ff4c3f6..4e25b81753 100644 --- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceTest.java +++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceIT.java @@ -34,7 +34,7 @@ import com.google.inject.Inject; /** * covers creating, reading and deleting of an item in dataStore */ -public class DataServiceTest extends AbstractTest { +public class DataServiceIT extends AbstractIT { protected DataBrokerService consumerDataService; diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NotificationTest.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NotificationIT.java similarity index 98% rename from opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NotificationTest.java rename to opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NotificationIT.java index 41208091cf..1a950a1062 100644 --- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NotificationTest.java +++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/NotificationIT.java @@ -31,10 +31,10 @@ import org.slf4j.LoggerFactory; /** * covers registering of notification listener, publishing of notification and receiving of notification. */ -public class NotificationTest extends AbstractTest { +public class NotificationIT extends AbstractIT { private static final Logger LOG = LoggerFactory - .getLogger(NotificationTest.class); + .getLogger(NotificationIT.class); protected final NotificationTestListener listener1 = new NotificationTestListener(); protected final NotificationTestListener listener2 = new NotificationTestListener(); diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/RoutedServiceTest.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/RoutedServiceIT.java similarity index 98% rename from opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/RoutedServiceTest.java rename to opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/RoutedServiceIT.java index 95abee42e5..c5833a8587 100644 --- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/RoutedServiceTest.java +++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/RoutedServiceIT.java @@ -39,10 +39,10 @@ import org.slf4j.LoggerFactory; /** * covers routed rpc creation, registration, invocation, unregistration */ -public class RoutedServiceTest extends AbstractTest { +public class RoutedServiceIT extends AbstractIT { private static final Logger LOG = LoggerFactory - .getLogger(RoutedServiceTest.class); + .getLogger(RoutedServiceIT.class); protected OpendaylightTestRoutedRpcService odlRoutedService1; protected OpendaylightTestRoutedRpcService odlRoutedService2; diff --git a/opendaylight/md-sal/sal-binding-it/src/test/resources/logback.xml b/opendaylight/md-sal/sal-binding-it/src/test/resources/logback.xml index 1d17796373..0d69c444b5 100644 --- a/opendaylight/md-sal/sal-binding-it/src/test/resources/logback.xml +++ b/opendaylight/md-sal/sal-binding-it/src/test/resources/logback.xml @@ -7,10 +7,12 @@ - - - - + + + + + + -- 2.36.6