You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2022/01/27 18:54:00 UTC
[jena] branch main updated: JENA-2262: Stabilize tests: separate TDB2 databases
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 0294eb4 JENA-2262: Stabilize tests: separate TDB2 databases
new b537785 Merge pull request #1177 from afs/test-fuseki-delete-tdb2
0294eb4 is described below
commit 0294eb4e9a6eccc2c1b8db5d0da7ee04eba7d5d4
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Jan 27 11:52:18 2022 +0000
JENA-2262: Stabilize tests: separate TDB2 databases
---
.../org/apache/jena/fuseki/server/DataService.java | 2 +-
.../java/org/apache/jena/fuseki/TestAdmin.java | 28 +++++++++++++++-------
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java
index ae94adf..682d504 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataService.java
@@ -303,7 +303,7 @@ public class DataService {
boolean isTDB1 = isTDB1(base);
boolean isTDB2 = isTDB2(base);
- if ( ( isTDB1 || isTDB2 ) ) {
+ if ( isTDB1 || isTDB2 ) {
// JENA-1586: Remove database from the process.
if ( isTDB1 )
org.apache.jena.tdb.sys.TDBInternal.expel(base);
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdmin.java b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdmin.java
index 2764761..f39c7a4 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdmin.java
+++ b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdmin.java
@@ -60,7 +60,14 @@ public class TestAdmin extends AbstractFusekiWebappTest {
// Name of the dataset in the assembler file.
static String dsTest = "test-ds1";
static String dsTestInf = "test-ds4";
- static String dsTestTdb2 = "test-tdb2";
+
+ // There are two Fuseki-TDB2 tests: add_delete_dataset_6() and compact_01().
+ //
+ // On certain build systems (GH action/Linux underload, ASF Jenkins sometimes),
+ // add_delete_dataset_6 fails (transactions active), or compact_01 (gets a 404),
+ // if the two databases are the same.
+ static String dsTestTdb2a = "test-tdb2a";
+ static String dsTestTdb2b = "test-tdb2b";
static String fileBase = "testing/";
@Before public void setLogging() {
@@ -204,18 +211,19 @@ public class TestAdmin extends AbstractFusekiWebappTest {
}
@Test public void add_delete_dataset_6() {
+ String testDB = dsTestTdb2a;
assumeNotWindows();
- checkNotThere(dsTestTdb2);
+ checkNotThere(testDB);
addTestDatasetTdb2();
// Check exists.
- checkExists(dsTestTdb2);
+ checkExists(testDB);
// Remove it.
- deleteDataset(dsTestTdb2);
- checkNotThere(dsTestTdb2);
+ deleteDataset(testDB);
+ checkNotThere(testDB);
}
@Test public void add_error_1() {
@@ -323,14 +331,16 @@ public class TestAdmin extends AbstractFusekiWebappTest {
@Test public void compact_01() {
assumeNotWindows();
+
+ String testDB = dsTestTdb2b;
try {
- checkNotThere(dsTestTdb2);
+ checkNotThere(testDB);
addTestDatasetTdb2();
- checkExists(dsTestTdb2);
+ checkExists(testDB);
String id = null;
try {
- JsonValue v = httpPostRtnJSON(ServerCtl.urlRoot() + "$/" + opCompact + "/" + dsTestTdb2);
+ JsonValue v = httpPostRtnJSON(ServerCtl.urlRoot() + "$/" + opCompact + "/" + testDB);
id = v.getAsObject().getString(JsonConstCtl.taskId);
} finally {
waitForTasksToFinish(1000, 500, 20_000);
@@ -353,7 +363,7 @@ public class TestAdmin extends AbstractFusekiWebappTest {
// Check task success
Assert.assertTrue("Expected task to be marked as successful", task.getAsObject().getBoolean(JsonConstCtl.success));
} finally {
- deleteDataset(dsTestTdb2);
+ deleteDataset(testDB);
}
}