Fix RecreateSKPs recipe to correctly fail when the upload fails

infra/bots/recipes/swarm_RecreateSKPs.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 for the Skia RecreateSKPs Bot."""
 
 
 DEPS = [
   'build/file',
@@ skipping 50 matching lines @@
   os.rename(token_file, os.path.join(home, TOKEN_FILE_BACKUP))
 
 with open(token_file, 'w') as f:
   f.write(contents)
         """ % (DEPOT_TOOLS_AUTH_TOKEN_FILE,
                DEPOT_TOOLS_AUTH_TOKEN_FILE_BACKUP,
                self._key),
     )
 
   def __exit__(self, t, v, tb):
-    return self.m.python.inline(
+    self.m.python.inline(
         'depot-tools-auth logout',
         """
 import os
 
 
 TOKEN_FILE = '%s'
 TOKEN_FILE_BACKUP = '%s'
 
 
 home = os.path.expanduser('~')
 token_file = os.path.join(home, TOKEN_FILE)
 if os.path.isfile(token_file):
   os.remove(token_file)
 
 backup_file = os.path.join(home, TOKEN_FILE_BACKUP)
 if os.path.isfile(backup_file):
   os.rename(backup_file, token_file)
         """ % (DEPOT_TOOLS_AUTH_TOKEN_FILE,
                DEPOT_TOOLS_AUTH_TOKEN_FILE_BACKUP),
     )
+    return v is None
 
 
 def RunSteps(api):
   # Check out Chrome.
   api.core.setup()
 
   src_dir = api.vars.checkout_root.join('src')
   out_dir = src_dir.join('out', 'Release')
 
   # Call GN.
@@ skipping 41 matching lines @@
            '--target_dir', output_dir]
     env.update(api.infra.go_env)
     with depot_tools_auth(api, UPDATE_SKPS_KEY):
       api.step('Upload SKPs',
                cmd=cmd,
                cwd=api.vars.skia_dir,
                env=env)
 
 
 def GenTests(api):
-  for mastername, slaves in TEST_BUILDERS.iteritems():
-    for slavename, builders_by_slave in slaves.iteritems():
-      for builder in builders_by_slave:
-        test = (
-            api.test(builder) +
-            api.properties(buildername=builder,
-                           mastername=mastername,
-                           slavename=slavename,
-                           revision='abc123',
-                           buildnumber=2,
-                           path_config='kitchen',
-                           swarm_out_dir='[SWARM_OUT_DIR]') +
-            api.path.exists(api.path['slave_build'].join('skp_output'))
-        )
-        yield test
+  mastername = 'client.skia.compile'
+  slavename = 'skiabot-linux-swarm-000'
+  builder = 'Housekeeper-Nightly-RecreateSKPs_Canary'
+  yield (
+      api.test(builder) +
+      api.properties(buildername=builder,
+                     mastername=mastername,
+                     slavename=slavename,
+                     revision='abc123',
+                     buildnumber=2,
+                     path_config='kitchen',
+                     swarm_out_dir='[SWARM_OUT_DIR]') +
+      api.path.exists(api.path['slave_build'].join('skp_output'))
+  )
+
+  builder = 'Housekeeper-Weekly-RecreateSKPs'
+  yield (
+      api.test(builder) +
+      api.properties(buildername=builder,
+                     mastername=mastername,
+                     slavename=slavename,
+                     revision='abc123',
+                     buildnumber=2,
+                     path_config='kitchen',
+                     swarm_out_dir='[SWARM_OUT_DIR]') +
+      api.path.exists(api.path['slave_build'].join('skp_output'))
+  )
+
+  yield (
+      api.test('failed_upload') +
+      api.properties(buildername=builder,
+                     mastername=mastername,
+                     slavename=slavename,
+                     revision='abc123',
+                     buildnumber=2,
+                     path_config='kitchen',
+                     swarm_out_dir='[SWARM_OUT_DIR]') +
+      api.path.exists(api.path['slave_build'].join('skp_output')) +
+      api.step_data('Upload SKPs', retcode=1)
+  )