[Findit] A huge refactoring and some bug fixing.

appengine/findit/handlers/build_failure.py

 # Copyright 2014 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.
 
 from collections import defaultdict
 import copy
 from datetime import datetime
 import os
 
 from google.appengine.api import users
 
 from base_handler import BaseHandler
 from base_handler import Permission
+from common import constants
 from handlers import handlers_util
 from handlers import result_status
 from handlers.result_status import NO_TRY_JOB_REASON_MAP
-from model import wf_analysis_status
+from model import analysis_status
 from model.wf_analysis import WfAnalysis
-from model.wf_analysis_result_status import RESULT_STATUS_TO_DESCRIPTION
+from model.result_status import RESULT_STATUS_TO_DESCRIPTION
 from waterfall import build_failure_analysis_pipelines
 from waterfall import buildbot
 from waterfall import waterfall_config
 
 
-BUILD_FAILURE_ANALYSIS_TASKQUEUE = 'build-failure-analysis-queue'
 NON_SWARMING = object()
 
 
 def _FormatDatetime(dt):
   if not dt:
     return None
   else:
     return dt.strftime('%Y-%m-%d %H:%M:%S UTC')
 
 
@@ skipping 119 matching lines @@
     {
         # A dict of results that contains both
         # heuristic analysis results and try job results.
         'reliable_failures': {
             'step1': {
                 'results': [
                     {
                         'try_job':{
                             'ref_name': 'step1',
                             'try_job_key': 'm/b/119',
-                            'status': wf_analysis_status.ANALYZED,
+                            'status': analysis_status.COMPLETED,
                             'try_job_url': 'url/121',
                             'try_job_build_number': 121,
                         },
                         'heuristic_analysis': {
                             'suspected_cls': [
                                 {
                                     'build_number': 98,
                                     'repo_name': 'chromium',
                                     'revision': 'r98_1',
                                     'commit_position': None,
@@ skipping 125 matching lines @@
 
     if not analysis:
       # Only allow admin to force a re-run and set the build_completed.
       force = (users.is_current_user_admin() and
                self.request.get('force') == '1')
       build_completed = (users.is_current_user_admin() and
                          self.request.get('build_completed') == '1')
       analysis = build_failure_analysis_pipelines.ScheduleAnalysisIfNeeded(
           master_name, builder_name, build_number,
           build_completed=build_completed, force=force,
-          queue_name=BUILD_FAILURE_ANALYSIS_TASKQUEUE)
+          queue_name=constants.WATERFALL_ANALYSIS_QUEUE)
 
     organized_results = _GetOrganizedAnalysisResultBySuspectedCL(
         analysis.result)
     analysis_result = _GetAnalysisResultWithTryJobInfo(
         organized_results, *build_info)
 
     data = {
         'master_name': analysis.master_name,
         'builder_name': analysis.builder_name,
         'build_number': analysis.build_number,
@@ skipping 10 matching lines @@
         'analysis_correct': analysis.correct,
         'triage_history': _GetTriageHistory(analysis),
         'show_triage_help_button': self._ShowTriageHelpButton(),
         'status_message_map': result_status.STATUS_MESSAGE_MAP
     }
 
     return {'template': 'build_failure.html', 'data': data}
 
   def HandlePost(self):  # pragma: no cover
     return self.HandleGet()