Add assumeTrue around hardware_vtep schema check

The images used in the jenkins jobs do not support hardware_vtep so this is needed to pass the test.

Change-Id: I8fe016c29613d0a520585d9419d63aa4887a3864
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/hardwarevtep/HardwareVTEPIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/hardwarevtep/HardwareVTEPIT.java
index c307c226f5706d0d984015fcb05c3be1c71b57fe..abf9866fd1c6ce670f51d25970ec604fbe7abae4 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/hardwarevtep/HardwareVTEPIT.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/hardwarevtep/HardwareVTEPIT.java
@@ -14,6 +14,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 import static org.opendaylight.ovsdb.lib.operations.Operations.op;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.options;
@@ -31,7 +32,6 @@ import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import javax.inject.Inject;
 import junit.framework.Assert;
-import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -141,7 +141,7 @@ public class HardwareVTEPIT  extends OvsdbIntegrationTestBase {
     @Before
     public void setUp () throws ExecutionException, InterruptedException, IOException {
         areWeReady(bc);
-        assertTrue(HARDWARE_VTEP + " is required.", checkSchema(HARDWARE_VTEP));
+        assumeTrue(HARDWARE_VTEP + " is required.", checkSchema(HARDWARE_VTEP));
         assertTrue("Failed to monitor tables", monitorTables());
     }
 
@@ -310,7 +310,7 @@ public class HardwareVTEPIT  extends OvsdbIntegrationTestBase {
      */
     public void managerInsert () throws ExecutionException, InterruptedException {
         //Ensure test only proceeds if HW VTEP is supported
-        Assume.assumeTrue(isSchemaSupported(getClient(), HARDWARE_VTEP));
+        assumeTrue(isSchemaSupported(getClient(), HARDWARE_VTEP));
 
         //proceed only if schema was already retrieved successfully
         Assert.assertNotNull(getDbSchema());
@@ -350,7 +350,7 @@ public class HardwareVTEPIT  extends OvsdbIntegrationTestBase {
     }
 
     public void managerDelete () throws ExecutionException, InterruptedException {
-        Assume.assumeTrue(isSchemaSupported(getClient(), HARDWARE_VTEP));
+        assumeTrue(isSchemaSupported(getClient(), HARDWARE_VTEP));
 
         Manager manager = getClient().getTypedRowWrapper(Manager.class, null);
         Global global = getClient().getTypedRowWrapper(Global.class, null);