commit 9599b0fd91778955786fafdcda97e4adb65cabf7
author Eric Boren <borenet@google.com> Tue Apr 17 15:55:57 2018 -0400
committer Eric Boren <borenet@google.com> Thu Apr 19 11:27:46 2018 +0000
tree f7ed0b156291484efc5044a20ad04e471935dd7c
parent a2b1ed5e9d2852bad5d8e1bddc299e920e73d6e0

Reland "[infra] Run recipes through Kitchen"

Bug: skia:7050
Change-Id: Icf0bcfbbc505c90a4e8cee7437037a3037bdf33b
Reviewed-on: https://skia-review.googlesource.com/121781
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

infra/bots/recipes/test.py

diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index b483fce..5e89abc 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -256,8 +256,8 @@
     if len(parts) == 3:
       args.extend(['--shard', parts[1]])
       args.extend(['--shards', parts[2]])
-    else:
-      raise Exception('Invalid task name - bad shards') #pragma: nocover
+    else: # pragma: nocover
+      raise Exception('Invalid task name - bad shards: %s' % tf)
 
   args.append('--config')
   args.extend(configs)
@@ -786,6 +786,7 @@
   use_hash_file = False
   if api.vars.upload_dm_results:
     host_dm_dir = str(api.vars.dm_dir)
+    api.flavor.create_clean_host_dir(api.vars.test_dir)
     device_dm_dir = str(api.flavor.device_dirs.dm_dir)
     if host_dm_dir != device_dm_dir:
       api.flavor.create_clean_device_dir(device_dm_dir)
@@ -1152,7 +1153,7 @@
     ) +
     api.step_data('dm', retcode=1) +
     api.step_data('pull /sdcard/revenge_of_the_skiabot/dm_out '+
-                  '[CUSTOM_[SWARM_OUT_DIR]]/dm', retcode=1)
+                  '[START_DIR]/[SWARM_OUT_DIR]/dm', retcode=1)
   )
 
   yield (