bot_update (+recipe_module): treat patch download as infra failure.

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 recipe_engine import recipe_api
 
 
@@ skipping 190 matching lines @@
 
     # Add suffixes to the step name, if specified.
     name = 'bot_update'
     if not patch:
       name += ' (without patch)'
     if suffix:
       name += ' - %s' % suffix
 
     # Ah hah! Now that everything is in place, lets run bot_update!
     try:
-      # 88 is the 'patch failure' return code.
-      self(name, cmd, step_test_data=step_test_data, ok_ret=(0, 88), **kwargs)
+      # 87 and 88 are the 'patch failure' codes for patch download and patch
+      # apply, respectively. We don't actually use the error codes, and instead
+      # rely on emitted json to determine cause of failure.
+      self(name, cmd, step_test_data=step_test_data,
+           ok_ret=(0, 87, 88), **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.
         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()
 
       # Set the "checkout" path for the main solution.
       # This is used by the Chromium module to figure out where to look for
       # the checkout.
       # If there is a patch failure, emit another step that said things failed.
       if step_result.json.output.get('patch_failure'):
-        # TODO(phajdan.jr): Differentiate between failure to download the patch
-        # and failure to apply it. The first is an infra failure, the latter
-        # a definite patch failure.
-        self.m.tryserver.set_patch_failure_tryjob_result()
-        self.m.python.failing_step(
-            'Patch failure', 'Check the bot_update step for details')
+        return_code = step_result.json.output.get('patch_apply_return_code')
+        if return_code == 3:
+          # This is download failure, hence an infra failure.
+          # Sadly, python.failing_step doesn't support kwargs.
+          self.m.python.inline(
+              'Patch failure',
+              ('import sys;'
+               'print "Check the bot_update step for details";'

[Sergiy Byelozyorov, 2015/10/02 13:53:20]

please change the message to explain that download of the patch failed

[tandrii(chromium), 2015/10/02 13:57:15]

Done.

+               'sys.exit(1)'),
+              infra_step=True,
+              step_test_data=lambda: self.m.raw_io.test_api.output(
+                "Check the bot_update step for details",
+                retcode=1)
+              )
+        else:
+          # This is actual patch failure.
+          self.m.tryserver.set_patch_failure_tryjob_result()
+          self.m.python.failing_step(
+              'Patch failure', 'Check the bot_update step for details')
 
       # 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'])
         if 'checkout' not in self.m.path:
           self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))
 
     return step_result