svn commit: r1673414 - in /jackrabbit/oak/trunk/oak-tarmk-standby: pom.xml src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java

[mreutegg]

Author: mreutegg
Date: Tue Apr 14 12:00:43 2015
New Revision: 1673414

URL: http://svn.apache.org/r1673414
Log:
OAK-2764: ExternalSharedStoreIT occasionally fails on travis

Skip test on travis

Modified:
    jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml
    
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java

Modified: jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml?rev=1673414&r1=1673413&r2=1673414&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml Tue Apr 14 12:00:43 2015
@@ -200,6 +200,13 @@
 
     <!-- Test Dependencies -->
     <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-commons</artifactId>
+      <classifier>tests</classifier>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

Modified: 
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java?rev=1673414&r1=1673413&r2=1673414&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java
 Tue Apr 14 12:00:43 2015
@@ -19,14 +19,17 @@
 package org.apache.jackrabbit.oak.plugins.segment.standby;
 
 import static 
org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir;
+import static org.junit.Assume.assumeTrue;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.jackrabbit.oak.commons.CIHelper;
 import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
 
 import org.junit.After;
+import org.junit.Before;
 
 public class ExternalSharedStoreIT extends DataStoreTestBase {
     private File externalStore;
@@ -36,6 +39,11 @@ public class ExternalSharedStoreIT exten
         this.storesCanBeEqual = true;
     }
 
+    @Before
+    public void checkEnvironment() {
+        assumeTrue(!CIHelper.travis());
+    }
+
     @After
     public void after() {
         closeServerAndClient();