svn commit: r1780252 - in /jackrabbit/oak/trunk: oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java

[frm]

Author: frm
Date: Wed Jan 25 18:00:34 2017
New Revision: 1780252

URL: http://svn.apache.org/viewvc?rev=1780252&view=rev
Log:
OAK-5518 - Skip tests from oak-tarmk-standby when running on Jenkins

Modified:
    
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
    
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java

Modified: 
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java?rev=1780252&r1=1780251&r2=1780252&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
 Wed Jan 25 18:00:34 2017
@@ -27,7 +27,20 @@ import static java.lang.System.getenv;
  * Utility class for ITs to determine the environment running in.
  */
 public final class CIHelper {
-    private CIHelper() { }
+
+    private CIHelper() {
+        // Prevent instantiation.
+    }
+
+    /**
+     * Check if this process is running on Jenkins.
+     *
+     * @return {@code true} if this process is running on Jenkins, {@code 
false}
+     * otherwise.
+     */
+    public static boolean jenkins() {
+        return getenv("JENKINS_URL") != null;
+    }
 
     /**
      * @return  {@code true} iff running on

Modified: 
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java?rev=1780252&r1=1780251&r2=1780252&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
 Wed Jan 25 18:00:34 2017
@@ -18,9 +18,11 @@
  */
 package org.apache.jackrabbit.oak.plugins.segment.standby;
 
+import static org.apache.jackrabbit.oak.commons.CIHelper.jenkins;
 import static 
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.SEGMENT_TAR;
 import static org.apache.jackrabbit.oak.commons.FixturesHelper.getFixtures;
 import static 
org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir;
+import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
 import java.io.File;
@@ -59,6 +61,11 @@ public class TestBase {
     File directoryC2;
     FileStore storeC2;
 
+    @BeforeClass
+    public static void assumeIsNotJenkins() {
+        assumeFalse(jenkins());
+    }
+
     /*
      Java 6 on Windows doesn't support dual IP stacks, so we will skip our IPv6
      tests.