[Findit] Moving check flake parameters to config

appengine/findit/handlers/config.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.
 
 """Handles requests to the findit config page."""
 
 import json
 
 from common.base_handler import BaseHandler
 from common.base_handler import Permission
@@ skipping 146 matching lines @@
 
 def _ValidateSwarmingSettings(settings):
   return (isinstance(settings, dict) and
           isinstance(settings.get('server_host'), basestring) and
           isinstance(settings.get('default_request_priority'), int) and
           isinstance(settings.get('request_expiration_hours'), int) and
           isinstance(settings.get('server_query_interval_seconds'), int) and
           isinstance(settings.get('task_timeout_hours'), int) and
           isinstance(settings.get('isolated_server'), basestring) and
           isinstance(settings.get('isolated_storage_url'), basestring) and
-          isinstance(settings.get('iterations_to_rerun'), int))
+          isinstance(settings.get('iterations_to_rerun'), int) and
+          isinstance(
+              settings.get('get_swarming_task_id_timeout_seconds'), int) and
+          isinstance(settings.get('get_swarming_task_id_wait_seconds'), int))
 
 
 def _ValidateDownloadBuildDataSettings(settings):
   return (isinstance(settings, dict) and
           isinstance(settings.get('download_interval_seconds'), int) and
           isinstance(settings.get(
               'memcache_master_download_expiration_seconds'), int) and
           isinstance(settings.get('use_chrome_build_extract'), bool))
 
 
 def _ValidateActionSettings(settings):
   return (isinstance(settings, dict) and
           isinstance(settings.get('cr_notification_build_threshold'), int) and
           isinstance(
               settings.get('cr_notification_latency_limit_minutes'), int))
 
 
+def _ValidateCheckFlakeSettings(settings):
+  return (isinstance(settings, dict) and
+          isinstance(settings.get('lower_flake_threshold'), float) and
+          isinstance(settings.get('upper_flake_threshold'), float) and
+          isinstance(settings.get('max_flake_in_a_row'), int) and
+          isinstance(settings.get('max_stable_in_a_row'), int) and
+          isinstance(settings.get('iterations_to_rerun'), int))
+
+
 # Maps config properties to their validation functions.
 _CONFIG_VALIDATION_FUNCTIONS = {
     'steps_for_masters_rules': _ValidateMastersAndStepsRulesMapping,
     'builders_to_trybots': _ValidateTrybotMapping,
     'try_job_settings': _ValidateTryJobSettings,
     'swarming_settings': _ValidateSwarmingSettings,
     'download_build_data_settings': _ValidateDownloadBuildDataSettings,
     'action_settings': _ValidateActionSettings,
+    'check_flake_settings': _ValidateCheckFlakeSettings,
 }
 
 
 def _ConfigurationDictIsValid(configuration_dict):
   """Checks that each configuration setting is properly formatted.
 
   Args:
       configuration_dict: A dictionary expected to map configuration properties
       by name to their intended settings. For example,
 
@@ skipping 43 matching lines @@
 
     latest_version = settings.GetLatestVersionNumber()
 
     data = {
         'masters': waterfall_config.GetStepsForMastersRules(settings),
         'builders': settings.builders_to_trybots,
         'try_job_settings': settings.try_job_settings,
         'swarming_settings': settings.swarming_settings,
         'download_build_data_settings': settings.download_build_data_settings,
         'action_settings': settings.action_settings,
+        'check_flake_settings': settings.check_flake_settings,
         'version': settings.version,
         'latest_version': latest_version,
         'updated_by': settings.updated_by,
         'updated_ts': _FormatTimestamp(settings.updated_ts)
     }
 
     return {'template': 'config.html', 'data': data}
 
   def HandlePost(self):
     data = self.request.params.get('data')
     new_config_dict = json.loads(data)
     if not _ConfigurationDictIsValid(new_config_dict):  # pragma: no cover
       return self.CreateError(
           'New configuration settings is not properly formatted.', 400)
 
     wf_config.FinditConfig.Get().Update(users.get_current_user(),
                                         users.IsCurrentUserAdmin(),
                                         **new_config_dict)
 
     return self.HandleGet()