You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/06/04 08:20:40 UTC

(jackrabbit-oak) branch trunk updated: OAK-10852: disable BranchCommitGCTest unmergedAddsThenMergedAddThenUnmergedRemovesChildren for FullGCMode.ORPHANS_EMPTYPROPS_UNMERGED_BC (#1506)

This is an automated email from the ASF dual-hosted git repository.

reschke 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 a9ae04f62f OAK-10852: disable BranchCommitGCTest unmergedAddsThenMergedAddThenUnmergedRemovesChildren for FullGCMode.ORPHANS_EMPTYPROPS_UNMERGED_BC (#1506)
a9ae04f62f is described below

commit a9ae04f62f46bb3f2c4d840db856abcd4a6fac37
Author: Julian Reschke <re...@apache.org>
AuthorDate: Tue Jun 4 10:20:34 2024 +0200

    OAK-10852: disable BranchCommitGCTest unmergedAddsThenMergedAddThenUnmergedRemovesChildren for FullGCMode.ORPHANS_EMPTYPROPS_UNMERGED_BC (#1506)
---
 .../org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java
index ec3025616d..cea34b85cc 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java
@@ -389,6 +389,7 @@ public class BranchCommitGCTest {
 
     @Test
     public void unmergedAddsThenMergedAddThenUnmergedRemovesChildren() throws Exception {
+        assumeTrue(fullGcMode != FullGCMode.ORPHANS_EMPTYPROPS_UNMERGED_BC); // see OAK-10852
         RevisionVector br1 = unmergedBranchCommit(b -> {
             b.child("a");
             b.child("b");