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 <ttkacik@cisco.com>

diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml
index 31bcbfd0080eaba84eb1553c9580af8e6749f9a0..6abe5de62601e929eba6a2e6dbe71bc89bc01f71 100644 (file)
--- a/opendaylight/md-sal/sal-binding-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-it/pom.xml
@@ -182,6 +182,30 @@
           </execution>
         </executions>
       </plugin>
           </execution>
         </executions>
       </plugin>

+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <executions>
+          <execution>
+              <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+              </goals>
+          </execution>
+        </executions>
+        <!-- PAX EXAM tests sometimes takes longer to run if
+             not enough system resources are provided and
+             default timeout of two minutes may be not enough
+             on some jenkins jobs. In order to not loose
+             results of these tests, but to prevent this
+             tests of failing verifies sporadically
+             this test suites are optional and should not
+             fail build.
+         -->
+        <configuration>
+            <testFailureIgnore>true</testFailureIgnore>
+        </configuration>
+      </plugin>

     </plugins>
   </build>
   <scm>
     </plugins>
   </build>
   <scm>

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 2075ba4421ac57d4a49a599a7b09ea43a82b6887..5bba4deee847622c5a8f368719600527570785bd 100644 (file)
--- 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;
 
  */
 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.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.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 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)
 @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";
 
     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;
     }
 
         return broker;
     }
 

-    public void setBroker(BindingAwareBroker broker) {
+    public void setBroker(final BindingAwareBroker broker) {

         this.broker = broker;
     }
 
         this.broker = broker;
     }
 


@@ -56,7 +55,7 @@ public abstract class AbstractTest {
         return bundleContext;
     }
 
         return bundleContext;
     }
 

-    public void setBundleContext(BundleContext bundleContext) {
+    public void setBundleContext(final BundleContext bundleContext) {

         this.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(), //
     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(),
                 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(),
                 systemPackages("sun.nio.ch"),
 
                 mdSalCoreBundles(),

-
-                bindingAwareSalBundles(),

                 configMinumumBundles(),
                 configMinumumBundles(),

+                bindingAwareSalBundles(),
+

                 // BASE Models
                 baseModelBundles(),
                 salTestModelBundles(),
                 // 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 853ff4c3f6885bec03fd7a06ea4155df7a0c2c58..4e25b8175383c48408b95b6ce9452b1a04a5a4b9 100644 (file)
--- 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
  */
 /**
  * covers creating, reading and deleting of an item in dataStore
  */

-public class DataServiceTest extends AbstractTest {
+public class DataServiceIT extends AbstractIT {

 
     protected DataBrokerService consumerDataService;
 
 
     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 41208091cfcf58e13a9f484020ca3d207e154c9e..1a950a10623c5e9b7a5a2c5cdcf02460233bac3d 100644 (file)
--- 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.
  */
 /**
  * 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
 
     private static final Logger LOG = LoggerFactory

-            .getLogger(NotificationTest.class);
+            .getLogger(NotificationIT.class);

 
     protected final NotificationTestListener listener1 = new NotificationTestListener();
     protected final NotificationTestListener listener2 = new NotificationTestListener();
 
     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 95abee42e54da5db63c86d112a7f30bc8023d9a3..c5833a8587461098a94ff040a2b433bab9f430cc 100644 (file)
--- 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
  */
 /**
  * covers routed rpc creation, registration, invocation, unregistration
  */

-public class RoutedServiceTest extends AbstractTest {
+public class RoutedServiceIT extends AbstractIT {

 
     private static final Logger LOG = LoggerFactory
 
     private static final Logger LOG = LoggerFactory

-            .getLogger(RoutedServiceTest.class);
+            .getLogger(RoutedServiceIT.class);

 
     protected OpendaylightTestRoutedRpcService odlRoutedService1;
     protected OpendaylightTestRoutedRpcService odlRoutedService2;
 
     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 1d177963738d49d7f7f6224545bfabea32d01341..0d69c444b559524cc6ff91ba7146989f7fffc757 100644 (file)
--- 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 @@
     </encoder>
   </appender>
 
     </encoder>
   </appender>
 

-
-  <logger name="org.opendaylight.yangtools.yang.parser.util.ModuleDependencySort" level="ERROR"/>
-
-  <root level="info">
+  <root level="INFO">

     <appender-ref ref="STDOUT" />
   </root>
     <appender-ref ref="STDOUT" />
   </root>

+  <logger name="org.opendaylight.yangtools" level="INFO"/>
+  <logger name="org.opendaylight.controller" level="INFO"/>
+  <logger name="org.opendaylight.config" level="DEBUG"/>
+  <logger name="org.opendaylight.yangtools.objcache" level="ERROR"/>
+  <logger name="org.opendaylight.yangtools.yang.parser.util.ModuleDependencySort" level="ERROR"/>

 </configuration>
 </configuration>