[Findit] Fixing when try job entities are created

appengine/findit/waterfall/try_job_util.py

 # Copyright 2015 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 google.appengine.ext import ndb
 
 from common import appengine_util
 from common import constants
+from common.waterfall import failure_type
 from model import analysis_status
 from model.wf_try_job import WfTryJob
 from waterfall import swarming_tasks_to_try_job_pipeline
 from waterfall import waterfall_config
 from waterfall.try_job_type import TryJobType
 
 
 def _CheckFailureForTryJobKey(
     master_name, builder_name, build_number,
     failure_result_map, failed_step_or_test, failure):
@@ skipping 69 matching lines @@
         master_name, builder_name, build_number,
         failure_result_map, TryJobType.COMPILE, failed_steps['compile'])
   else:
     try_job_type = TryJobType.TEST
     targeted_tests, need_new_try_job, last_pass = (
         _CheckIfNeedNewTryJobForTestFailure(
             'step', master_name, builder_name, build_number, failure_result_map,
             failed_steps))
 
   if need_new_try_job:
-    try_job = WfTryJob.Get(
-        master_name, builder_name, build_number)
+    try_job = WfTryJob.Get(master_name, builder_name, build_number)
 
     if try_job:
       if try_job.failed:
         try_job.status = analysis_status.PENDING
         try_job.put()
       else:
         need_new_try_job = False
     else:
-      try_job = WfTryJob.Create(
-          master_name, builder_name, build_number)
+      try_job = WfTryJob.Create(master_name, builder_name, build_number)
       try_job.put()
 
   return need_new_try_job, last_pass, try_job_type, targeted_tests
 
 
 def _GetFailedTargetsFromSignals(signals, master_name, builder_name):
   compile_targets = []
 
   if not signals or 'compile' not in signals:
     return compile_targets
@@ skipping 27 matching lines @@
   build_number = failure_info['build_number']
   failed_steps = failure_info.get('failed_steps', [])
   builds = failure_info.get('builds', {})
 
   tryserver_mastername, tryserver_buildername = (
       waterfall_config.GetTrybotForWaterfallBuilder(master_name, builder_name))
 
   if not tryserver_mastername or not tryserver_buildername:
     logging.info('%s, %s is not supported yet.', master_name, builder_name)
     return {}
+  elif (failure_info['failure_type'] == failure_type.TEST and
+        waterfall_config.ShouldSkipTestTryJobs(master_name, builder_name)):
+    logging.info('Test try jobs on %s, %s are not supported yet.',
+                 master_name, builder_name)
+    return {}
 
   failure_result_map = {}
   need_new_try_job, last_pass, try_job_type, targeted_tests = (
       _NeedANewTryJob(master_name, builder_name, build_number,
                       failed_steps, failure_result_map))
 
-  if (try_job_type == TryJobType.TEST and
-      waterfall_config.ShouldSkipTestTryJobs(master_name, builder_name)):
-    logging.info('Test try jobs on %s, %s are not supported yet.',
-                 master_name, builder_name)
-    return {}
-
   if need_new_try_job:
     compile_targets = (_GetFailedTargetsFromSignals(
         signals, master_name, builder_name)
                        if try_job_type == TryJobType.COMPILE else None)
     suspected_revisions = (
         _GetSuspectsForCompileFailureFromHeuristicResult(heuristic_result)
         if try_job_type == TryJobType.COMPILE else None)
 
     pipeline = (
         swarming_tasks_to_try_job_pipeline.SwarmingTasksToTryJobPipeline(
@@ skipping 16 matching lines @@
               pipeline.pipeline_status_path, try_job_type)
     else:  # pragma: no cover
       logging_str = (
           'Try job was scheduled for build %s, %s, %s: %s because of %s '
           'failure.') % (
               master_name, builder_name, build_number,
               pipeline.pipeline_status_path, try_job_type)
     logging.info(logging_str)
 
   return failure_result_map