svn commit: r1572215 - in /jackrabbit/oak/trunk/oak-jcr: pom.xml src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationRefreshTest.java

[angela]

Author: angela
Date: Wed Feb 26 19:40:34 2014
New Revision: 1572215

URL: http://svn.apache.org/r1572215
Log:
OAK-1267: test no longer fails on my machine -> re-enabling

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

Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1572215&r1=1572214&r2=1572215&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Wed Feb 26 19:40:34 2014
@@ -78,7 +78,6 @@
       org.apache.jackrabbit.core.observation.ReorderTest                       
                    <!-- Uses SNS -->
       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.observation.ObservationRefreshTest <!-- 
[tripod] currently too slow...will fix soon -->
 
       <!-- Versioning -->
       org.apache.jackrabbit.test.api.version.VersionTest#testMerge

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationRefreshTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationRefreshTest.java?rev=1572215&r1=1572214&r2=1572215&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationRefreshTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationRefreshTest.java
 Wed Feb 26 19:40:34 2014
@@ -42,7 +42,6 @@ import org.apache.jackrabbit.oak.jcr.rep
 import org.apache.jackrabbit.test.api.util.Text;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static javax.jcr.observation.Event.NODE_ADDED;
@@ -99,7 +98,6 @@ public class ObservationRefreshTest exte
         observingSession.logout();
     }
 
-    @Ignore("OAK-1267") // FIXME: OAK-1267
     @Test
     public void observation() throws RepositoryException, 
InterruptedException, ExecutionException {
         final MyListener listener = new MyListener();