Fix flaky test IntegrationTest_MultiSpoutsMultiTasks (#1815)

* fix flaky integration test MultiSpoutsMultiTasks

* re-enable IntegrationTest_MultiSpoutsMultiTasks

Author: huijunwu

integration-test/src/java/com/twitter/heron/integration_test/core/IntegrationTestBolt.java

@@ -81,7 +81,6 @@ private int calculateTerminalsToReceive(TopologyContext context) {
 
   @Override
   public void execute(Tuple tuple) {
-    tuplesReceived++;
     String streamID = tuple.getSourceStreamId();
 
     LOG.info("Received a tuple: " + tuple + " ; from: " + streamID);
@@ -105,6 +104,7 @@ public void execute(Tuple tuple) {
             "Received a terminal, need to receive %s more", terminalsToReceive));
       }
     } else {
+      tuplesReceived++;
       currentTupleProcessing = tuple;
       delegateBolt.execute(tuple);
       // We ack only the tuples in user's logic

integration-test/src/python/test_runner/resources/test.json

@@ -57,6 +57,11 @@
       "classPath"    : "bolt_double_emit_tuples.BoltDoubleEmitTuples",
       "expectedResultRelativePath" : "bolt_double_emit_tuples/resources/BoltDoubleEmitTuples.json"
     },
+    {
+      "topologyName" : "IntegrationTest_MultiSpoutsMultiTasks",
+      "classPath"    : "multi_spouts_multi_tasks.MultiSpoutsMultiTasks",
+      "expectedResultRelativePath" : "multi_spouts_multi_tasks/resources/MultiSpoutsMultiTasks.json"
+    },
     {
       "topologyName" : "IntegrationTest_OneBoltMultiTasks",
       "classPath"    : "one_bolt_multi_tasks.OneBoltMultiTasks",