(jackrabbit-oak) 01/01: OAK-10974 and OAK-10869 : temporarily disabling flaky tests

[stefanegli]

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

stefanegli pushed a commit to branch OAK-10974_and_OAK-10869
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git

commit ad514945ee0e6154c9e0f673c18a236483d464ff
Author: Stefan Egli <stefane...@apache.org>
AuthorDate: Wed Jul 24 19:23:50 2024 +0200

    OAK-10974 and OAK-10869 : temporarily disabling flaky tests
---
 .../jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git 
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
 
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
index 4b89c52d7c..b6aa5efbe8 100644
--- 
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
+++ 
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
@@ -1707,6 +1707,8 @@ public class VersionGarbageCollectorIT {
     // OAK-8646
     @Test
     public void testDeletedPropsAndUnmergedBCWithoutCollision() throws 
Exception {
+        // OAK-10974:
+        assumeTrue(fullGcMode != 
FullGCMode.ORPHANS_EMPTYPROPS_KEEP_ONE_ALL_PROPS);
         // create a node with property.
         NodeBuilder nb = store1.getRoot().builder();
         nb.child("bar").setProperty("prop", "value");
@@ -2358,6 +2360,8 @@ public class VersionGarbageCollectorIT {
 
     @Test
     public void testDeletedPropsAndUnmergedBCWithCollisionWithDryRunMode() 
throws Exception {
+        // OAK-10869:
+        assumeTrue(fullGcMode != 
FullGCMode.ORPHANS_EMPTYPROPS_KEEP_ONE_ALL_PROPS);
         // create a node with property.
         NodeBuilder nb = store1.getRoot().builder();
         nb.child("bar").setProperty("prop", "value");