[Findit] A huge refactoring and some bug fixing.

appengine/findit/handlers/test/monitor_alerts_test.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 textwrap
 
 import webapp2
 
+from common import constants
 from common.http_client_appengine import RetryHttpClient
 from handlers import monitor_alerts
 from waterfall import build_failure_analysis_pipelines
 from waterfall.test import wf_testcase
 
 
 class _MockedHttpClient(RetryHttpClient):
 
   def __init__(self, status_code, content):
     self.status_code = status_code
@@ skipping 135 matching lines @@
         },
     ]
 
     def MockGetLatestBuildFailures(*_):
       return build_failures
     self.mock(
         monitor_alerts, '_GetLatestBuildFailures', MockGetLatestBuildFailures)
 
     expected_scheduled_analyses = [
         ('m3', 'b3', 3, ['s3'], False,
-         monitor_alerts._BUILD_FAILURE_ANALYSIS_TASKQUEUE),
+         constants.WATERFALL_ANALYSIS_QUEUE),
     ]
 
     scheduled_analyses = []
     def MockScheduleAnalysisIfNeeded(master_name, builder_name, build_number,
                                      failed_steps, force, queue_name):
       scheduled_analyses.append(
           (master_name, builder_name, build_number,
            failed_steps, force, queue_name))
 
     self.mock(build_failure_analysis_pipelines, 'ScheduleAnalysisIfNeeded',
               MockScheduleAnalysisIfNeeded)
 
     self.mock_current_user(user_email='test@chromium.org', is_admin=True)
     response = self.test_app.get('/monitor-alerts')
     self.assertEqual(200, response.status_int)
 
     self.assertEqual(expected_scheduled_analyses, scheduled_analyses)