[Findit] Refactoring monitor swarming task pipelines

appengine/findit/waterfall/process_flake_swarming_task_result_pipeline.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 
 from collections import defaultdict
 
 from model.flake.flake_swarming_task import FlakeSwarmingTask
 from model.flake.master_flake_analysis import DataPoint
 from model.flake.master_flake_analysis import MasterFlakeAnalysis
 from waterfall.process_base_swarming_task_result_pipeline import (
     ProcessBaseSwarmingTaskResultPipeline)
 
 
 class ProcessFlakeSwarmingTaskResultPipeline(
     ProcessBaseSwarmingTaskResultPipeline):
   """A pipeline for monitoring swarming task and processing task result.
 
   This pipeline waits for result for a swarming task and processes the result to
   generate a dict for statuses for each test run.
   """
 
+  def _GetArgs(self, master_name, builder_name, build_number,
+               step_name, *args):
+    master_build_number = args[0]
+    test_name = args[1]
+    version_number = args[2]
+    return (master_name, builder_name, build_number, step_name,
+            master_build_number, test_name, version_number)
+
+  # Unused Argument - pylint: disable=W0612,W0613
+  # Arguments number differs from overridden method - pylint: disable=W0221
+  def _GetSwarmingTask(self, master_name, builder_name, build_number,
+                       step_name, master_build_number, test_name, _):
+    # Gets the appropriate kind of swarming task (FlakeSwarmingTask).
+    return FlakeSwarmingTask.Get(master_name, builder_name, build_number,
+                                 step_name, test_name)
+
   # Arguments number differs from overridden method - pylint: disable=W0221
   def _CheckTestsRunStatuses(self, output_json, master_name,
                              builder_name, build_number, step_name,
                              master_build_number, test_name, version_number):
     """Checks result status for each test run and saves the numbers accordingly.
 
     Args:
       output_json (dict): A dict of all test results in the swarming task.
       master_name (string): Name of master of swarming rerun.
       builder_name (dict): Name of builder of swarming rerun.
@@ skipping 52 matching lines @@
     flake_swarming_task.put()
 
     results = flake_swarming_task.GetFlakeSwarmingTaskData()
     # TODO(lijeffrey): Determine whether or not this flake swarming task
     # was a cache hit (already ran results for more iterations than were
     # requested) and update results['cache_hit'] accordingly.
     master_flake_analysis.swarming_rerun_results.append(results)
     master_flake_analysis.put()
     return tests_statuses
 
-  def _GetArgs(self, master_name, builder_name, build_number,
-               step_name, *args):
-    master_build_number = args[0]
-    test_name = args[1]
-    version_number = args[2]
-    return (master_name, builder_name, build_number, step_name,
-            master_build_number, test_name, version_number)
-
-  # Unused Argument - pylint: disable=W0612,W0613
-  def _GetSwarmingTask(self, master_name, builder_name, build_number,
-                       step_name, master_build_number, test_name, _):
-    # Get the appropriate kind of Swarming Task (Flake).
-    return FlakeSwarmingTask.Get(master_name, builder_name,
-                                 build_number, step_name, test_name)
+  def run(self, master_name, builder_name, build_number, step_name, task_id,

[chanli, 2016/11/08 19:26:00]

I think there is no need to change this class...

[lijeffrey, 2016/11/08 21:45:00]

Done.

+          *args):
+    call_args = self._GetArgs(master_name, builder_name, build_number,
+                              step_name, *args)
+    step_name_no_platform = self._MonitorSwarmingTask(task_id, *call_args)
+    return step_name, step_name_no_platform