You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2021/05/12 17:02:56 UTC
[jackrabbit-filevault] branch master updated: releng: improve
concurrency of ITs
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/master by this push:
new ae0a51d releng: improve concurrency of ITs
ae0a51d is described below
commit ae0a51d7060ecc8e171737f590b56d1dde704948
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed May 12 19:02:34 2021 +0200
releng: improve concurrency of ITs
---
vault-core/pom.xml | 5 +++++
.../vault/packaging/integration/IntegrationTestBase.java | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/vault-core/pom.xml b/vault-core/pom.xml
index 37252f7..092c475 100644
--- a/vault-core/pom.xml
+++ b/vault-core/pom.xml
@@ -400,9 +400,12 @@
<configuration>
<systemPropertyVariables>
<oak>true</oak>
+ <repoIndex>${surefire.forkNumber}</repoIndex>
</systemPropertyVariables>
<argLine>@{jacoco.command} -Xmx1024m</argLine>
<reportNameSuffix>OAK</reportNameSuffix>
+ <forkCount>4</forkCount>
+ <reuseForks>true</reuseForks>
</configuration>
</execution>
<execution>
@@ -413,6 +416,8 @@
<configuration>
<reportNameSuffix>JR</reportNameSuffix>
<summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-jr.xml</summaryFile>
+ <forkCount>4</forkCount>
+ <reuseForks>true</reuseForks>
</configuration>
</execution>
<execution>
diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
index d4cf0ec..01eaf21 100644
--- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
+++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
@@ -126,9 +126,9 @@ public class IntegrationTestBase {
private static final Logger log = LoggerFactory.getLogger(IntegrationTestBase.class);
private static final String REPO_HOME = "target/repository";
- private static final File DIR_REPO_HOME = new File(REPO_HOME);
- private static final File DIR_DATA_STORE = new File(REPO_HOME + "/datastore");
- private static final File DIR_BLOB_STORE = new File(REPO_HOME + "/blobstore");
+ private static final File DIR_REPO_HOME = new File(REPO_HOME + System.getProperty("repoIndex", "0"));
+ private static final File DIR_DATA_STORE = new File(DIR_REPO_HOME, "datastore");
+ private static final File DIR_BLOB_STORE = new File(DIR_REPO_HOME, "blobstore");
public static final PackageId TMP_PACKAGE_ID = new PackageId("my_packages", "tmp", "");
@@ -201,7 +201,7 @@ public class IntegrationTestBase {
admin.logout();
} else {
try (InputStream in = IntegrationTestBase.class.getResourceAsStream("repository.xml")) {
- RepositoryConfig cfg = RepositoryConfig.create(in, REPO_HOME);
+ RepositoryConfig cfg = RepositoryConfig.create(in, DIR_REPO_HOME.getPath());
repository = RepositoryImpl.create(cfg);
}
}