You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mj...@apache.org on 2015/10/07 23:07:59 UTC

flink git commit: [FLINK-2381] [Storm Compatibility] Failing Test: WrapperSetupHelperTest

Repository: flink
Updated Branches:
  refs/heads/master 5c2c112b2 -> f332fa579


[FLINK-2381] [Storm Compatibility] Failing Test: WrapperSetupHelperTest


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f332fa57
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f332fa57
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f332fa57

Branch: refs/heads/master
Commit: f332fa579635878a82594aa749db050272f1a35a
Parents: 5c2c112
Author: mjsax <mj...@apache.org>
Authored: Wed Oct 7 21:22:49 2015 +0200
Committer: mjsax <mj...@apache.org>
Committed: Wed Oct 7 23:01:58 2015 +0200

----------------------------------------------------------------------
 .../storm/wrappers/WrapperSetupHelperTest.java  | 24 +++++++++-----------
 1 file changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/f332fa57/flink-contrib/flink-storm/src/test/java/org/apache/flink/storm/wrappers/WrapperSetupHelperTest.java
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-storm/src/test/java/org/apache/flink/storm/wrappers/WrapperSetupHelperTest.java b/flink-contrib/flink-storm/src/test/java/org/apache/flink/storm/wrappers/WrapperSetupHelperTest.java
index 19d05a8..a5399b0 100644
--- a/flink-contrib/flink-storm/src/test/java/org/apache/flink/storm/wrappers/WrapperSetupHelperTest.java
+++ b/flink-contrib/flink-storm/src/test/java/org/apache/flink/storm/wrappers/WrapperSetupHelperTest.java
@@ -181,14 +181,13 @@ public class WrapperSetupHelperTest extends AbstractTest {
 		builder.setBolt("bolt1", (IRichBolt) operators.get("bolt1"), dops.get("bolt1")).shuffleGrouping("spout1");
 		builder.setBolt("bolt2", (IRichBolt) operators.get("bolt2"), dops.get("bolt2")).allGrouping("spout2");
 		builder.setBolt("sink", (IRichBolt) operators.get("sink"), dops.get("sink"))
-		.fieldsGrouping("bolt1", TestDummyBolt.groupingStreamId, new Fields("id"))
-		.shuffleGrouping("bolt1", TestDummyBolt.shuffleStreamId)
-		.fieldsGrouping("bolt2", TestDummyBolt.groupingStreamId, new Fields("id"))
-		.shuffleGrouping("bolt2", TestDummyBolt.shuffleStreamId);
-
-		final int maxRetry = 3;
-		int counter;
-		for (counter = 0; counter < maxRetry; ++counter) {
+			.fieldsGrouping("bolt1", TestDummyBolt.groupingStreamId, new Fields("id"))
+			.shuffleGrouping("bolt1", TestDummyBolt.shuffleStreamId)
+			.fieldsGrouping("bolt2", TestDummyBolt.groupingStreamId, new Fields("id"))
+			.shuffleGrouping("bolt2", TestDummyBolt.shuffleStreamId);
+
+		int counter = 0;
+		while (true) {
 			LocalCluster cluster = new LocalCluster();
 			Config c = new Config();
 			c.setNumAckers(0);
@@ -200,7 +199,6 @@ public class WrapperSetupHelperTest extends AbstractTest {
 				break;
 			}
 		}
-		Assert.assertTrue(counter < maxRetry);
 
 		TestTopologyBuilder flinkBuilder = new TestTopologyBuilder();
 
@@ -209,10 +207,10 @@ public class WrapperSetupHelperTest extends AbstractTest {
 		flinkBuilder.setBolt("bolt1", (IRichBolt) operators.get("bolt1"), dops.get("bolt1")).shuffleGrouping("spout1");
 		flinkBuilder.setBolt("bolt2", (IRichBolt) operators.get("bolt2"), dops.get("bolt2")).allGrouping("spout2");
 		flinkBuilder.setBolt("sink", (IRichBolt) operators.get("sink"), dops.get("sink"))
-		.fieldsGrouping("bolt1", TestDummyBolt.groupingStreamId, new Fields("id"))
-		.shuffleGrouping("bolt1", TestDummyBolt.shuffleStreamId)
-		.fieldsGrouping("bolt2", TestDummyBolt.groupingStreamId, new Fields("id"))
-		.shuffleGrouping("bolt2", TestDummyBolt.shuffleStreamId);
+			.fieldsGrouping("bolt1", TestDummyBolt.groupingStreamId, new Fields("id"))
+			.shuffleGrouping("bolt1", TestDummyBolt.shuffleStreamId)
+			.fieldsGrouping("bolt2", TestDummyBolt.groupingStreamId, new Fields("id"))
+			.shuffleGrouping("bolt2", TestDummyBolt.shuffleStreamId);
 
 		flinkBuilder.createTopology();
 		StormTopology stormTopology = flinkBuilder.getStormTopology();