You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2015/04/13 18:23:35 UTC
[5/5] flink git commit: [tests] Cleanup sysout logging in tests
[tests] Cleanup sysout logging in tests
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/69a400fa
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/69a400fa
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/69a400fa
Branch: refs/heads/master
Commit: 69a400fadd258fe0a1ff0b5670a3611fda4c1cdf
Parents: e79813b
Author: Stephan Ewen <se...@apache.org>
Authored: Mon Apr 13 16:37:16 2015 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Mon Apr 13 16:38:22 2015 +0200
----------------------------------------------------------------------
.../operations/DegreesWithExceptionITCase.java | 64 +++++++++++---------
.../flink/test/misc/AutoParallelismITCase.java | 1 +
.../flink/test/misc/NullValuesITCase.java | 1 +
.../test/recovery/SimpleRecoveryITCase.java | 4 ++
.../TaskManagerFailureRecoveryITCase.java | 1 +
5 files changed, 43 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/69a400fa/flink-staging/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/DegreesWithExceptionITCase.java
----------------------------------------------------------------------
diff --git a/flink-staging/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/DegreesWithExceptionITCase.java b/flink-staging/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/DegreesWithExceptionITCase.java
index 489e50a..b04b24e 100644
--- a/flink-staging/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/DegreesWithExceptionITCase.java
+++ b/flink-staging/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/DegreesWithExceptionITCase.java
@@ -21,11 +21,13 @@ package org.apache.flink.graph.test.operations;
import org.apache.flink.api.java.ExecutionEnvironment;
import org.apache.flink.api.java.io.DiscardingOutputFormat;
import org.apache.flink.api.java.tuple.Tuple2;
+
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.graph.Graph;
import org.apache.flink.graph.test.TestGraphUtils;
import org.apache.flink.test.util.ForkableFlinkMiniCluster;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -37,17 +39,19 @@ public class DegreesWithExceptionITCase {
private static final int PARALLELISM = 4;
private static ForkableFlinkMiniCluster cluster;
-
- @BeforeClass
- public static void suppressOutput() {
- TestGraphUtils.pipeSystemOutToNull();
- }
+
@BeforeClass
public static void setupCluster() {
- Configuration config = new Configuration();
- config.setInteger(ConfigConstants.TASK_MANAGER_NUM_TASK_SLOTS, PARALLELISM);
- cluster = new ForkableFlinkMiniCluster(config, false);
+ try {
+ Configuration config = new Configuration();
+ config.setInteger(ConfigConstants.TASK_MANAGER_NUM_TASK_SLOTS, PARALLELISM);
+ cluster = new ForkableFlinkMiniCluster(config, false);
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ fail("Error starting test cluster: " + e.getMessage());
+ }
}
@AfterClass
@@ -56,7 +60,6 @@ public class DegreesWithExceptionITCase {
cluster.stop();
}
catch (Throwable t) {
- System.err.println("Error stopping cluster on shutdown");
t.printStackTrace();
fail("Cluster shutdown caused an exception: " + t.getMessage());
}
@@ -70,9 +73,9 @@ public class DegreesWithExceptionITCase {
final ExecutionEnvironment env = ExecutionEnvironment.createRemoteEnvironment(
"localhost", cluster.getJobManagerRPCPort());
-
env.setParallelism(PARALLELISM);
-
+ env.getConfig().disableSysoutLogging();
+
Graph<Long, Long, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongVertexData(env),
TestGraphUtils.getLongLongEdgeInvalidSrcData(env), env);
@@ -86,15 +89,16 @@ public class DegreesWithExceptionITCase {
}
}
+ /**
+ * Test inDegrees() with an edge having a trgId that does not exist in the vertex DataSet
+ */
@Test
public void testInDegreesInvalidEdgeTrgId() throws Exception {
- /*
- * Test inDegrees() with an edge having a trgId that does not exist in the vertex DataSet
- */
+
final ExecutionEnvironment env = ExecutionEnvironment.createRemoteEnvironment(
"localhost", cluster.getJobManagerRPCPort());
-
env.setParallelism(PARALLELISM);
+ env.getConfig().disableSysoutLogging();
Graph<Long, Long, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongVertexData(env),
TestGraphUtils.getLongLongEdgeInvalidTrgData(env), env);
@@ -109,15 +113,16 @@ public class DegreesWithExceptionITCase {
}
}
+ /**
+ * Test getDegrees() with an edge having a trgId that does not exist in the vertex DataSet
+ */
@Test
public void testGetDegreesInvalidEdgeTrgId() throws Exception {
- /*
- * Test getDegrees() with an edge having a trgId that does not exist in the vertex DataSet
- */
+
final ExecutionEnvironment env = ExecutionEnvironment.createRemoteEnvironment(
"localhost", cluster.getJobManagerRPCPort());
-
env.setParallelism(PARALLELISM);
+ env.getConfig().disableSysoutLogging();
Graph<Long, Long, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongVertexData(env),
TestGraphUtils.getLongLongEdgeInvalidTrgData(env), env);
@@ -132,15 +137,16 @@ public class DegreesWithExceptionITCase {
}
}
+ /**
+ * Test getDegrees() with an edge having a srcId that does not exist in the vertex DataSet
+ */
@Test
public void testGetDegreesInvalidEdgeSrcId() throws Exception {
- /*
- * Test getDegrees() with an edge having a srcId that does not exist in the vertex DataSet
- */
+
final ExecutionEnvironment env = ExecutionEnvironment.createRemoteEnvironment(
"localhost", cluster.getJobManagerRPCPort());
-
env.setParallelism(PARALLELISM);
+ env.getConfig().disableSysoutLogging();
Graph<Long, Long, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongVertexData(env),
TestGraphUtils.getLongLongEdgeInvalidSrcData(env), env);
@@ -155,15 +161,16 @@ public class DegreesWithExceptionITCase {
}
}
+ /**
+ * Test getDegrees() with an edge having a srcId and a trgId that does not exist in the vertex DataSet
+ */
@Test
public void testGetDegreesInvalidEdgeSrcTrgId() throws Exception {
- /*
- * Test getDegrees() with an edge having a srcId and a trgId that does not exist in the vertex DataSet
- */
+
final ExecutionEnvironment env = ExecutionEnvironment.createRemoteEnvironment(
"localhost", cluster.getJobManagerRPCPort());
-
env.setParallelism(PARALLELISM);
+ env.getConfig().disableSysoutLogging();
Graph<Long, Long, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongVertexData(env),
TestGraphUtils.getLongLongEdgeInvalidSrcTrgData(env), env);
@@ -173,7 +180,8 @@ public class DegreesWithExceptionITCase {
env.execute();
fail("graph.getDegrees() did not fail.");
- } catch (Exception e) {
+ }
+ catch (Exception e) {
// We expect the job to fail with an exception
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/69a400fa/flink-tests/src/test/java/org/apache/flink/test/misc/AutoParallelismITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/misc/AutoParallelismITCase.java b/flink-tests/src/test/java/org/apache/flink/test/misc/AutoParallelismITCase.java
index aeab77b..df190d7 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/misc/AutoParallelismITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/misc/AutoParallelismITCase.java
@@ -79,6 +79,7 @@ public class AutoParallelismITCase {
"localhost", cluster.getJobManagerRPCPort());
env.setParallelism(ExecutionConfig.PARALLELISM_AUTO_MAX);
+ env.getConfig().disableSysoutLogging();
DataSet<Integer> result = env
.createInput(new ParallelismDependentInputFormat())
http://git-wip-us.apache.org/repos/asf/flink/blob/69a400fa/flink-tests/src/test/java/org/apache/flink/test/misc/NullValuesITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/misc/NullValuesITCase.java b/flink-tests/src/test/java/org/apache/flink/test/misc/NullValuesITCase.java
index e0ebadd..6f7d002 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/misc/NullValuesITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/misc/NullValuesITCase.java
@@ -49,6 +49,7 @@ public class NullValuesITCase {
ExecutionEnvironment.createRemoteEnvironment("localhost", cluster.getJobManagerRPCPort());
env.setParallelism(1);
+ env.getConfig().disableSysoutLogging();
DataSet<String> data = env.fromElements("hallo")
.map(new MapFunction<String, String>() {
http://git-wip-us.apache.org/repos/asf/flink/blob/69a400fa/flink-tests/src/test/java/org/apache/flink/test/recovery/SimpleRecoveryITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/SimpleRecoveryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/SimpleRecoveryITCase.java
index 0361af8..e61e551 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recovery/SimpleRecoveryITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/SimpleRecoveryITCase.java
@@ -81,6 +81,7 @@ public class SimpleRecoveryITCase {
env.setParallelism(4);
env.setNumberOfExecutionRetries(0);
+ env.getConfig().disableSysoutLogging();
env.generateSequence(1, 10)
.rebalance()
@@ -110,6 +111,7 @@ public class SimpleRecoveryITCase {
env.setParallelism(4);
env.setNumberOfExecutionRetries(0);
+ env.getConfig().disableSysoutLogging();
env.generateSequence(1, 10)
.rebalance()
@@ -156,6 +158,7 @@ public class SimpleRecoveryITCase {
env.setParallelism(4);
env.setNumberOfExecutionRetries(1);
+ env.getConfig().disableSysoutLogging();
env.generateSequence(1, 10)
.rebalance()
@@ -200,6 +203,7 @@ public class SimpleRecoveryITCase {
env.setParallelism(4);
env.setNumberOfExecutionRetries(5);
+ env.getConfig().disableSysoutLogging();
env.generateSequence(1, 10)
.rebalance()
http://git-wip-us.apache.org/repos/asf/flink/blob/69a400fa/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerFailureRecoveryITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerFailureRecoveryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerFailureRecoveryITCase.java
index aa92925..1c9f798 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerFailureRecoveryITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerFailureRecoveryITCase.java
@@ -87,6 +87,7 @@ public class TaskManagerFailureRecoveryITCase {
env.setParallelism(PARALLELISM);
env.setNumberOfExecutionRetries(1);
+ env.getConfig().disableSysoutLogging();
env.generateSequence(1, 10)
.map(new FailingMapper<Long>())