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 2015/04/28 13:33:21 UTC
svn commit: r1676493 - in /jackrabbit/oak/branches/1.2: ./
oak-tarmk-standby/pom.xml
oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java
Author: mreutegg
Date: Tue Apr 28 11:33:20 2015
New Revision: 1676493
URL: http://svn.apache.org/r1676493
Log:
OAK-2764: ExternalSharedStoreIT occasionally fails on travis
Merged revision 1673414 from trunk
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-tarmk-standby/pom.xml
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 11:33:20 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675055,1675332,1675354,1675357,1675593,1676198,1676458
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675055,1675332,1675354,1675357,1675593,1676198,1676458
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-tarmk-standby/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-tarmk-standby/pom.xml?rev=1676493&r1=1676492&r2=1676493&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/pom.xml (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/pom.xml Tue Apr 28 11:33:20 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/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java?rev=1676493&r1=1676492&r2=1676493&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java Tue Apr 28 11:33:20 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();