Change models.py to use typed class members instead of a list of strings.

verification/try_job_on_rietveld.py

 # coding=utf8
 # Copyright (c) 2012 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.
 """Sends patches to the Try server and reads back results.
 
 - RietveldTryJobs contains RietveldTryJob, one per try job on a builder.
 - TryRunnerRietveld uses Rietveld to signal and poll job results.
 """
 
@@ skipping 19 matching lines @@
   if timestamp < (time.time() - 4*24*60*60):
     return True
   if checkout.revisions(revision, None) >= 200:
     return True
   return False
 
 
 class RietveldTryJobPending(model.PersistentMixIn):
   """Represents a pending try job for a pending commit that we care about.
   """
-  persistent = [
-    'builder', 'revision', 'requested_steps',
-    'clobber', 'tries',
-  ]
-  def __init__(self, builder, revision, requested_steps, clobber, tries):
-    super(RietveldTryJobPending, self).__init__()
-    self.builder = builder
-    self.revision = revision
-    self.requested_steps = requested_steps
-    self.clobber = clobber
-    # Number of retries for this configuration. Initial try is 1.
-    self.tries = tries
+  builder = str
+  revision = (None, str, int)
+  requested_steps = list
+  clobber = bool
+  # Number of retries for this configuration. Initial try is 1.
+  tries = int
 
 
 class RietveldTryJob(model.PersistentMixIn):
   """Represents a try job for a pending commit that we care about.
 
   This data can be regenerated by parsing all the try job names but it is a bit
   hard on the try server.
   """
-  persistent = [
-    'builder', 'build', 'revision', 'requested_steps', 'started',
-    'steps_passed', 'steps_failed', 'clobber', 'completed', 'tries',
-    'parent_key', 'init_time',
-  ]
+  builder = str
+  build = int
+  revision = (None, str, int)
+  requested_steps = list
+  # The timestamp when the build started.
+  started = int
+  steps_passed = list
+  steps_failed = list
+  clobber = bool
+  completed = bool
+  # Number of retries for this configuration. Initial try is 1.
+  tries = int
+  parent_key = (None, str)
+  init_time = int
 
-  def __init__(
-      self, builder, build, revision, requested_steps, started, steps_passed,
-      steps_failed, clobber, completed, tries, parent_key):
-    super(RietveldTryJob, self).__init__()
-    self.builder = builder
-    self.build = build
-    self.revision = revision
-    self.requested_steps = requested_steps
-    # The timestamp when the build started.
-    self.started = started
-    self.steps_passed = steps_passed
-    self.steps_failed = steps_failed
-    self.clobber = clobber
-    self.completed = completed
-    self.init_time = time.time()
-    # Number of retries for this configuration. Initial try is 1.
-    self.tries = tries
-    self.parent_key = parent_key
+  def __init__(self, **kwargs):
+    super(RietveldTryJob, self).__init__(init_time=time.time(), **kwargs)
 
   @property
   def result(self):
     if self.steps_failed:
       return buildbot_json.FAILURE
     if self.completed:
       return buildbot_json.SUCCESS
     return None
 
   def stewed(self):
     """Returns True if this job has had time to propagate."""
     return time.time() - self.init_time > PROPOGATION_DELAY_S
 
   def __eq__(self, rhs):
-    for i in self.persistent:
+    for i in self._persistent_members():
       if getattr(self, i) != getattr(rhs, i):
         return False
     return True
 
   def __ne__(self, rhs):
     return not self.__eq__(rhs)
 
 
 class RietveldTryJobs(base.IVerifierStatus):
   """A set of try jobs that were sent for a specific patch.
 
   Multiple concurrent try jobs can be sent on a single builder. For example, a
   previous valid try job could have been triggered by the user but was not
   completed so another was sent with the missing tests.
   Also, a try job is sent as soon as a test failure is detected.
   """
-  persistent = base.IVerifierStatus.persistent + [
-    'try_jobs', 'irrelevant', 'skipped', 'builders_and_tests', 'pendings',
-    'triggered_builders',
-  ]
-
-  def __init__(self):
-    super(RietveldTryJobs, self).__init__()
-    # An dict of RietveldTryJob objects per key.
-    self.try_jobs = {}
-    # The try job keys we ignore because they can't be used to give a good
-    # signal: either they are too old (old revision) or they were not triggerd
-    # by Rietveld, so we don't know if the diff is 100% good.
-    self.irrelevant = []
-    # When NOTRY=true is specified.
-    self.skipped = False
-    # Mapping from builders to list of tests.
-    self.builders_and_tests = {}
-    # Mapping from triggered builders to their parent.  Do not change this
-    # directly.  Instead use self.update_triggered_builders()
-    self.triggered_builders = {}
-    # Jobs that have been sent but are not found yet. Likely a builder is fully
-    # utilized or the try server hasn't polled Rietveld yet. list of
-    # RietveldTryJobPending() instances.
-    self.pendings = []
+  # An dict of RietveldTryJob objects per key.
+  try_jobs = dict
+  # The try job keys we ignore because they can't be used to give a good
+  # signal: either they are too old (old revision) or they were not triggerd
+  # by Rietveld, so we don't know if the diff is 100% good.
+  irrelevant = list
+  # When NOTRY=true is specified.
+  skipped = bool
+  # Mapping from builders to list of tests.
+  builders_and_tests = dict
+  # Mapping from triggered builders to their parent.  Do not change this
+  # directly.  Instead use self.update_triggered_builders()
+  triggered_builders = dict
+  # Jobs that have been sent but are not found yet. Likely a builder is fully
+  # utilized or the try server hasn't polled Rietveld yet. list of
+  # RietveldTryJobPending() instances.
+  pendings = list
 
   def update_triggered_builders(self, new_triggered_builders):
     """Add triggered builders to verification list.
 
     Args:
       new_triggered_builders: list of (builder, parent_name, list of tests)
     """
     for builder, parent, tests in new_triggered_builders:
       if builder in self.triggered_builders:
         logging.warning(
@@ skipping 449 matching lines @@
     return match and match.group(1).lower() == 'true'
 
   def _update_jobs_from_rietveld(self, pending, jobs):
     """Grabs data from Rietveld and pass it to
     RietveldTryJobs.update_jobs_from_rietveld().
     """
     data = self.context.rietveld.get_patchset_properties(
         pending.issue, pending.patchset)
     return jobs.update_jobs_from_rietveld(
         data, self.status, self.context.checkout)