Re-land r289084 - "Make telemetry*_unittests upload to test-results.appspot.com"

scripts/slave/recipe_modules/bot_update/api.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.
 
 
 """Recipe module to ensure a checkout is consistant on a bot."""
 
 
 from slave import recipe_api
 from slave import recipe_util
@@ skipping 30 matching lines @@
       ret += ']'
     elif isinstance(spec, basestring):
       ret = repr(str(spec))
     else:
       ret = repr(spec)
   return ret
 
 
 class BotUpdateApi(recipe_api.RecipeApi):
 
+  def __init__(self, *args, **kwargs):
+      self._properties = {}
+      super(BotUpdateApi, self).__init__(*args, **kwargs)
+
   def __call__(self, name, cmd, **kwargs):
     """Wrapper for easy calling of bot_update."""
     assert isinstance(cmd, (list, tuple))
     bot_update_path = self.m.path['build'].join(
         'scripts', 'slave', 'bot_update.py')
     return self.m.python(name, bot_update_path, cmd, **kwargs)
 
+  @property
+  def properties(self):
+      return self._properties
+
   def ensure_checkout(self, gclient_config=None, suffix=None,
                       patch=True, update_presentation=True,
                       force=False, patch_root=None, no_shallow=False,
                       **kwargs):
     # We can re-use the gclient spec from the gclient module, since all the
     # data bot_update needs is already configured into the gclient spec.
     cfg = gclient_config or self.m.gclient.c
     spec_string = jsonish_to_python(cfg.as_jsonish(), True)
 
     # Used by bot_update to determine if we want to run or not.
@@ skipping 83 matching lines @@
       name += ' (without patch)'
     if suffix:
       name += ' - %s' % suffix
 
     # Ah hah! Now that everything is in place, lets run bot_update!
     try:
       self(name, cmd, step_test_data=step_test_data, **kwargs)
     finally:
       step_result = self.m.step.active_result
 
+      self._properties = step_result.json.output.get('properties', {})
+
       if update_presentation:
         # Set properties such as got_revision.
-        if 'properties' in step_result.json.output:
-          properties = step_result.json.output['properties']
-          for prop_name, prop_value in properties.iteritems():
-            step_result.presentation.properties[prop_name] = prop_value
+        for prop_name, prop_value in self.properties.iteritems():
+          step_result.presentation.properties[prop_name] = prop_value
       # Add helpful step description in the step UI.
       if 'step_text' in step_result.json.output:
         step_text = step_result.json.output['step_text']
         step_result.presentation.step_text = step_text
       # Add log line output.
       if 'log_lines' in step_result.json.output:
         for log_name, log_lines in step_result.json.output['log_lines']:
           step_result.presentation.logs[log_name] = log_lines.splitlines()
       # Abort the build on failure, if its not a patch failure.
       if step_result.presentation.status == self.m.step.FAILURE:
@@ skipping 17 matching lines @@
             step_test_data=self.test_api.patch_error_data)
 
       # bot_update actually just sets root to be the folder name of the
       # first solution.
       if step_result.json.output['did_run']:
         co_root = step_result.json.output['root']
         cwd = kwargs.get('cwd', self.m.path['slave_build'])
         self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))
 
     return step_result