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 mr...@apache.org on 2019/01/30 09:33:52 UTC

svn commit: r1852513 - /jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java

Author: mreutegg
Date: Wed Jan 30 09:33:52 2019
New Revision: 1852513

URL: http://svn.apache.org/viewvc?rev=1852513&view=rev
Log:
OAK-8012: Unmerged branch changes visible after restart

Enable test

Modified:
    jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java

Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java?rev=1852513&r1=1852512&r2=1852513&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchTest.java Wed Jan 30 09:33:52 2019
@@ -22,7 +22,6 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
 import org.apache.jackrabbit.oak.plugins.document.util.Utils;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -76,7 +75,6 @@ public class BranchTest {
         assertModifiedPaths(b.getModifiedPathsUntil(c5));
     }
 
-    @Ignore("OAK-8012")
     @Test
     public void orphanedBranchTest() {
         String rootId = Utils.getIdFromPath("/");