This is an automated email from the ASF dual-hosted git repository.
baedke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new be5b9e64bb OAK-11056: o.a.j.o.plugins.document.ClusterTest fails if
neither MongoDB nor Docker are available (#1666)
be5b9e64bb is described below
commit be5b9e64bb5c12eb3d2a19aa3214f7bf1f2b0baa
Author: mbaedke <[email protected]>
AuthorDate: Thu Aug 22 15:25:54 2024 +0200
OAK-11056: o.a.j.o.plugins.document.ClusterTest fails if neither MongoDB
nor Docker are available (#1666)
ClusterTest is now running on a memory fixture again.
---
.../oak/plugins/document/ClusterTest.java | 44 +++++++++++-----------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
index 00aa0c1044..8c3a75c34e 100644
---
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
+++
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
@@ -64,7 +64,7 @@ public class ClusterTest {
@Rule
public MongoConnectionFactory connectionFactory = new
MongoConnectionFactory();
- private static final boolean MONGO_DB = true;
+ private static final boolean MONGO_DB = false;
private List<DocumentMK> mks = Lists.newArrayList();
private MemoryDocumentStore ds;
@@ -384,26 +384,28 @@ public class ClusterTest {
@Test
public void diffManyChildrenReadOnlyMode() throws Exception {
- DocumentMK mk1 = createMK(1, 0);
- DocumentMK mk2 = createMK(2, 0);
- NodeBuilder builder = mk1.getNodeStore().getRoot().builder();
- builder.child("foo1").child("bar1");
- merge(mk1.getNodeStore(), builder);
- mk1.runBackgroundOperations();
- mk2.runBackgroundOperations();
- RevisionVector fromRev =
mk1.getNodeStore().getRoot().getLastRevision();
- Thread.sleep(1000);
- builder = mk1.getNodeStore().getRoot().builder();
- builder.getChildNode("foo1").getChildNode("bar1").setProperty("test",
"test");
- merge(mk1.getNodeStore(), builder);
- disposeMK(mk1);
- Thread.sleep(1000);
- mk1 = createMK(1, 0);
- DocumentMK mk1ro = createMK(1, 0, true);
- DocumentMK mk3rw = createMK(3, 0, false);
- Thread.sleep(5000);
- compareDiffs(mk1.getNodeStore(), mk1ro.getNodeStore(), fromRev,
mk1.getNodeStore().getRoot().getLastRevision());
- compareDiffs(mk1.getNodeStore(), mk3rw.getNodeStore(), fromRev,
mk1.getNodeStore().getRoot().getLastRevision());
+ if (MONGO_DB) {
+ DocumentMK mk1 = createMK(1, 0);
+ DocumentMK mk2 = createMK(2, 0);
+ NodeBuilder builder = mk1.getNodeStore().getRoot().builder();
+ builder.child("foo1").child("bar1");
+ merge(mk1.getNodeStore(), builder);
+ mk1.runBackgroundOperations();
+ mk2.runBackgroundOperations();
+ RevisionVector fromRev =
mk1.getNodeStore().getRoot().getLastRevision();
+ Thread.sleep(1000);
+ builder = mk1.getNodeStore().getRoot().builder();
+
builder.getChildNode("foo1").getChildNode("bar1").setProperty("test", "test");
+ merge(mk1.getNodeStore(), builder);
+ disposeMK(mk1);
+ Thread.sleep(1000);
+ mk1 = createMK(1, 0);
+ DocumentMK mk1ro = createMK(1, 0, true);
+ DocumentMK mk3rw = createMK(3, 0, false);
+ Thread.sleep(5000);
+ compareDiffs(mk1.getNodeStore(), mk1ro.getNodeStore(), fromRev,
mk1.getNodeStore().getRoot().getLastRevision());
+ compareDiffs(mk1.getNodeStore(), mk3rw.getNodeStore(), fromRev,
mk1.getNodeStore().getRoot().getLastRevision());
+ }
}
private void compareDiffs(DocumentNodeStore store1, DocumentNodeStore
store2, RevisionVector from, RevisionVector to) {