svn commit: r1510471 - in /jackrabbit/oak/trunk/oak-jcr: pom.xml src/test/java/org/apache/jackrabbit/oak/jcr/CompatibilityIssuesTest.java

[chetanm]

Author: chetanm
Date: Mon Aug  5 13:12:00 2013
New Revision: 1510471

URL: http://svn.apache.org/r1510471
Log:
OAK-939 - Removing modified node in different session leads to conflict

Fixing testcase failure. Newer testcase need to be ignored via @Ignore 
annotation and not via entry in pom.xml

Modified:
    jackrabbit/oak/trunk/oak-jcr/pom.xml
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CompatibilityIssuesTest.java

Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1510471&r1=1510470&r2=1510471&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Mon Aug  5 13:12:00 2013
@@ -310,8 +310,6 @@
       org.apache.jackrabbit.core.observation.ShareableNodesTest#testAddShare   
                      <!-- OAK-118 workspace support needed -->
       
org.apache.jackrabbit.core.observation.ShareableNodesTest#testRemoveShare       
               <!-- OAK-118 workspace support needed -->
       org.apache.jackrabbit.oak.jcr.nodetype.NodeDefinitionTest#testRootType   
                      <!-- OAK-901 -->
-
-      
org.apache.jackrabbit.oak.jcr.CompatibilityIssuesTest#removeNodeInDifferentSession
           <!-- OAK-939 -->
     </known.issues>
   </properties>
 

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CompatibilityIssuesTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CompatibilityIssuesTest.java?rev=1510471&r1=1510470&r2=1510471&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CompatibilityIssuesTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CompatibilityIssuesTest.java
 Mon Aug  5 13:12:00 2013
@@ -27,6 +27,7 @@ import javax.jcr.SimpleCredentials;
 import javax.jcr.nodetype.ConstraintViolationException;
 
 import org.apache.jackrabbit.api.JackrabbitRepository;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.HashMap;
@@ -127,6 +128,7 @@ public class CompatibilityIssuesTest ext
      * CommitFailedException but it passes in JR2
      */
     @Test
+    @Ignore("OAK-939") // FIXME
     public void removeNodeInDifferentSession() throws RepositoryException {
 
         final String testNode = "test_node";