From 8e3e5adc78396a6f2a8d5e38556b96fc5f227c84 Mon Sep 17 00:00:00 2001 From: laa Date: Thu, 6 Jul 2017 15:34:21 +0300 Subject: [PATCH] CI build magic number failure fix --- core/pom.xml | 16 ++++++++++ .../local/OLocalHashTableTestIT.java | 8 +++-- .../core/index/sbtree/local/SBTreeTestIT.java | 5 ++++ graphdb/pom.xml | 10 +++++++ object/pom.xml | 17 +++++++++++ server/pom.xml | 2 -- tests/pom.xml | 29 ++++++++++++++++++- 7 files changed, 82 insertions(+), 5 deletions(-) mode change 100644 => 100755 object/pom.xml mode change 100644 => 100755 server/pom.xml mode change 100644 => 100755 tests/pom.xml diff --git a/core/pom.xml b/core/pom.xml index e22a53f2056..d7abf184ed5 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -174,6 +174,22 @@ + + org.apache.maven.plugins + maven-failsafe-plugin + ${surefire.version} + + + ${project.build.directory} + + + + listener + com.orientechnologies.OJUnitTestLeaksListener + + + + org.apache.maven.plugins maven-jar-plugin diff --git a/core/src/test/java/com/orientechnologies/orient/core/index/hashindex/local/OLocalHashTableTestIT.java b/core/src/test/java/com/orientechnologies/orient/core/index/hashindex/local/OLocalHashTableTestIT.java index fb9a92e2e36..163ad09630c 100755 --- a/core/src/test/java/com/orientechnologies/orient/core/index/hashindex/local/OLocalHashTableTestIT.java +++ b/core/src/test/java/com/orientechnologies/orient/core/index/hashindex/local/OLocalHashTableTestIT.java @@ -7,6 +7,7 @@ import com.orientechnologies.orient.core.storage.impl.local.OAbstractPaginatedStorage; import org.junit.After; +import java.io.File; import java.io.IOException; /** @@ -15,13 +16,16 @@ */ public class OLocalHashTableTestIT extends OLocalHashTableBase { - public OLocalHashTableTestIT() { + public OLocalHashTableTestIT() throws Exception { String buildDirectory = System.getProperty("buildDirectory"); if (buildDirectory == null) buildDirectory = "."; - databaseDocumentTx = new ODatabaseDocumentTx("plocal:" + buildDirectory + "/localHashTableTest"); + final File dbDirectory = new File(buildDirectory, "localHashTableTest"); + System.out.println(this.getClass().getSimpleName() + " test is initializing using DB directory = " + dbDirectory); + + databaseDocumentTx = new ODatabaseDocumentTx("plocal:" + dbDirectory.getCanonicalPath()); if (databaseDocumentTx.exists()) { databaseDocumentTx.open("admin", "admin"); databaseDocumentTx.drop(); diff --git a/core/src/test/java/com/orientechnologies/orient/core/index/sbtree/local/SBTreeTestIT.java b/core/src/test/java/com/orientechnologies/orient/core/index/sbtree/local/SBTreeTestIT.java index 6f193efe44f..523c0c84945 100755 --- a/core/src/test/java/com/orientechnologies/orient/core/index/sbtree/local/SBTreeTestIT.java +++ b/core/src/test/java/com/orientechnologies/orient/core/index/sbtree/local/SBTreeTestIT.java @@ -5,12 +5,14 @@ import com.orientechnologies.orient.core.db.record.OIdentifiable; import com.orientechnologies.orient.core.id.ORID; import com.orientechnologies.orient.core.id.ORecordId; +import com.orientechnologies.orient.core.index.hashindex.local.OLocalHashTableTestIT; import com.orientechnologies.orient.core.serialization.serializer.binary.impl.OLinkSerializer; import com.orientechnologies.orient.core.storage.impl.local.OAbstractPaginatedStorage; import org.junit.After; import org.junit.Assert; import org.junit.Test; +import java.io.File; import java.util.*; /** @@ -28,6 +30,9 @@ public SBTreeTestIT() { if (buildDirectory == null) buildDirectory = "."; + final File dbDirectory = new File(buildDirectory, "localSBTreeTest"); + System.out.println(this.getClass().getSimpleName() + " test is initializing using DB directory = " + dbDirectory); + databaseDocumentTx = new ODatabaseDocumentTx("plocal:" + buildDirectory + "/localSBTreeTest"); if (databaseDocumentTx.exists()) { databaseDocumentTx.open("admin", "admin"); diff --git a/graphdb/pom.xml b/graphdb/pom.xml index 0219930ddc8..2691393e5b3 100755 --- a/graphdb/pom.xml +++ b/graphdb/pom.xml @@ -164,6 +164,16 @@ + + org.apache.maven.plugins + maven-failsafe-plugin + ${surefire.version} + + + ${project.build.directory} + + + diff --git a/object/pom.xml b/object/pom.xml old mode 100644 new mode 100755 index a40492f10fd..588fe72e4e4 --- a/object/pom.xml +++ b/object/pom.xml @@ -107,6 +107,23 @@ + + org.apache.maven.plugins + maven-failsafe-plugin + ${surefire.version} + + + ${project.build.directory} + + + + listener + com.orientechnologies.OJUnitTestLeaksListener + + + + + diff --git a/server/pom.xml b/server/pom.xml old mode 100644 new mode 100755 index be9fd5d9f31..fd858355310 --- a/server/pom.xml +++ b/server/pom.xml @@ -157,8 +157,6 @@ ${project.build.directory} - ${orient.server.testMode} - ${orient.server.port} ${exclude.test.1} diff --git a/tests/pom.xml b/tests/pom.xml old mode 100644 new mode 100755 index 6da63e7de90..448e5991392 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -194,7 +194,34 @@ - + + org.apache.maven.plugins + maven-failsafe-plugin + ${surefire.version} + + + 60000 + false + false + + false + false + false + 10 + ${project.build.directory} + ${project.basedir} + true + 4096 + true + + + + listener + com.orientechnologies.OTestNGTestLeaksListener + + + +