(jackrabbit-oak) branch trunk updated: OAK-10843 : exclude a flaky test combination (#1554)

[stefanegli]

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

stefanegli 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 a0294fdda2 OAK-10843 : exclude a flaky test combination (#1554)
a0294fdda2 is described below

commit a0294fdda242cbc553ad1dc066c9a7084e1cf695
Author: stefan-egli <stefane...@apache.org>
AuthorDate: Mon Jun 24 18:00:42 2024 +0200

    OAK-10843 : exclude a flaky test combination (#1554)
---
 .../org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java  | 2 ++
 1 file changed, 2 insertions(+)

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 a6e2f9821d..6711953d0c 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
@@ -242,6 +242,7 @@ public class BranchCommitGCTest {
     @Test
     public void testDeletedPropsAndUnmergedBC() throws Exception {
         assumeTrue(fullGcMode != 
FullGCMode.ORPHANS_EMPTYPROPS_KEEP_ONE_ALL_PROPS);
+        assumeTrue(fullGcMode != 
FullGCMode.ORPHANS_EMPTYPROPS_BETWEEN_CHECKPOINTS_WITH_UNMERGED_BC);
 
         // create a node with property.
         NodeBuilder nb = store.getRoot().builder();
@@ -294,6 +295,7 @@ public class BranchCommitGCTest {
     @Test
     public void unmergedAddTwoChildren() throws Exception {
         assumeTrue(fullGcMode != 
FullGCMode.ORPHANS_EMPTYPROPS_KEEP_ONE_ALL_PROPS);
+        assumeTrue(fullGcMode != FullGCMode.ORPHANS_EMPTYPROPS_UNMERGED_BC);
         RevisionVector br1 = unmergedBranchCommit(b -> {
             b.child("a");
             b.child("b");