Merge branch 'APEXCORE-427' of https://github.com/davidyan74/incubator-apex-core
diff --git a/.travis.yml b/.travis.yml
index f414c25..b18dfda 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,10 +15,7 @@
language: java
-script: mvn apache-rat:check verify -Dlicense.skip=false
-
-env:
- - TRAVIS=1
+script: mvn apache-rat:check verify -Dlicense.skip=false -Dtravis=true
notifications:
slack:
diff --git a/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java b/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java
index 3bf9b11..385e1ae 100644
--- a/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java
@@ -36,6 +36,8 @@
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.io.DataInputByteBuffer;
@@ -926,6 +928,7 @@
// disable this test in travis because of an intermittent problem similar to this:
// http://stackoverflow.com/questions/32172925/travis-ci-sporadic-timeouts-to-localhost
// We should remove this when we find a solution to this.
+ LOG.info("Test testAppDataPush is disabled in Travis");
return;
}
final String topic = "xyz";
@@ -1114,4 +1117,6 @@
criticalPathInfo.latency > latency);
lc.shutdown();
}
+
+ private static final Logger LOG = LoggerFactory.getLogger(StreamingContainerManagerTest.class);
}
diff --git a/engine/src/test/java/com/datatorrent/stram/plan/logical/DelayOperatorTest.java b/engine/src/test/java/com/datatorrent/stram/plan/logical/DelayOperatorTest.java
index edd6dd9..6b31d56 100644
--- a/engine/src/test/java/com/datatorrent/stram/plan/logical/DelayOperatorTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/plan/logical/DelayOperatorTest.java
@@ -37,6 +37,8 @@
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.yarn.util.Clock;
import org.apache.hadoop.yarn.util.SystemClock;
@@ -329,6 +331,7 @@
if (StramTestSupport.isInTravis()) {
// disable this test in travis because the failure is apparently intermittently not invoked only on travis
// We should remove this when we find a solution to this.
+ LOG.info("Test testFibonacciRecovery1 is disabled in Travis");
return;
}
LogicalPlan dag = StramTestSupport.createDAG(testMeta);
@@ -368,6 +371,7 @@
if (StramTestSupport.isInTravis()) {
// disable this test in travis because the failure is apparently intermittently not invoked only on travis
// We should remove this when we find a solution to this.
+ LOG.info("Test testFibonacciRecovery2 is disabled in Travis");
return;
}
LogicalPlan dag = StramTestSupport.createDAG(testMeta);
@@ -482,4 +486,6 @@
dag.validate();
}
+ private static final Logger LOG = LoggerFactory.getLogger(DelayOperatorTest.class);
+
}
diff --git a/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java b/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java
index 43741c0..7b4bf76 100644
--- a/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java
+++ b/engine/src/test/java/com/datatorrent/stram/support/StramTestSupport.java
@@ -389,7 +389,7 @@
public static boolean isInTravis()
{
- return "1".equals(System.getenv("TRAVIS"));
+ return "true".equals(System.getProperty("travis"));
}
public static class MemoryStorageAgent implements StorageAgent, Serializable
