(jackrabbit-oak) branch trunk updated: OAK-10891: disable flaky test BranchCommitGCTest.testDeletedPropsAndUnmergedBCfor mode ORPHANS_EMPTYPROPS_KEEP_ONE_ALL_PROPS (#1528)

[joscorbe]

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

joscorbe 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 bfa618b018 OAK-10891: disable flaky test 
BranchCommitGCTest.testDeletedPropsAndUnmergedBCfor mode 
ORPHANS_EMPTYPROPS_KEEP_ONE_ALL_PROPS (#1528)
bfa618b018 is described below

commit bfa618b0181cb4d8fa38ba1783e270c3c933e3e6
Author: José Andrés Cordero Benítez <josco...@users.noreply.github.com>
AuthorDate: Fri Jun 14 12:36:19 2024 +0200

    OAK-10891: disable flaky test 
BranchCommitGCTest.testDeletedPropsAndUnmergedBCfor mode 
ORPHANS_EMPTYPROPS_KEEP_ONE_ALL_PROPS (#1528)
---
 .../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 d0fe5a45aa..033ff3ff7c 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
@@ -241,6 +241,8 @@ public class BranchCommitGCTest {
 
     @Test
     public void testDeletedPropsAndUnmergedBC() throws Exception {
+        assumeTrue(fullGcMode != 
FullGCMode.ORPHANS_EMPTYPROPS_KEEP_ONE_ALL_PROPS);
+
         // create a node with property.
         NodeBuilder nb = store.getRoot().builder();
         nb.child("bar").setProperty("prop", "value");