Make blink_trybot recipe work on windows

scripts/slave/recipes/blink_trybot.py

 # Copyright 2013 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.
 
-DEPS = ['step', 'chromium', 'step_history', 'path', 'gclient', 'rietveld',
-        'properties', 'json']
+DEPS = ['python', 'chromium', 'step_history', 'path', 'gclient', 'rietveld',

[agable, 2013/06/25 15:55:28]

Can we please sort these DEPS everywhere?

[iannucci, 2013/06/25 21:22:09]

Done.

+        'properties', 'json', 'step']
 
 def GenSteps(api):
-  api.chromium.set_config('blink')
+  api.chromium.set_config('blink', GIT_MODE=True)
   api.chromium.apply_config('trybot_flavor')
   api.step.auto_resolve_conflicts = True
 
   webkit_lint = api.path.build('scripts', 'slave', 'chromium',
                                'lint_test_files_wrapper.py')
 
   def BlinkTestsStep(with_patch):
     name = 'webkit_tests (with%s patch)' % ('' if with_patch else 'out')
     test = api.path.build('scripts', 'slave', 'chromium',
                           'layout_test_wrapper.py')
     args = ['--target', api.chromium.c.BUILD_CONFIG,
             '-o', api.path.slave_build('layout-test-results'),
             '--build-dir', api.path.checkout(api.chromium.c.build_dir),
             api.json.output()]
     return api.chromium.runtests(test, args, name=name, can_fail_build=False)
 
   yield (
     api.gclient.checkout(),
     api.rietveld.apply_issue('third_party', 'WebKit'),
     api.chromium.runhooks(),
     api.chromium.compile(),
     api.chromium.runtests('webkit_unit_tests'),
-    api.step('webkit_lint', [
-      'python', webkit_lint, '--build-dir', api.path.checkout('out'),
-      '--target', api.properties['build_config']]),
+    api.python('webkit_lint', webkit_lint, [
+      '--build-dir', api.path.checkout('out'),
+      '--target', api.properties['build_config']])
   )
 
   yield BlinkTestsStep(with_patch=True)
   if api.step_history.last_step().retcode == 0:
-    yield api.step('webkit_tests', ['python', '-c', 'print "ALL IS WELL"'])
+    yield api.python.inline('webkit_tests', 'print "ALL IS WELL"')
     return
 
   failing_tests = api.step_history.last_step().json.output
 
   yield (
     api.gclient.revert(),
     api.chromium.runhooks(),
     api.chromium.compile(),
     BlinkTestsStep(with_patch=False),
   )
   base_failing_tests = api.step_history.last_step().json.output
 
-  final_script = ['python',
+  yield api.python(
+    'webkit_tests',
     api.path.checkout('third_party', 'WebKit', 'Tools', 'Scripts',
                       'print-json-test-results'),
-    '--ignored-failures-path', api.json.input(base_failing_tests),
-    api.json.input(failing_tests),
-  ]
-  yield api.step('webkit_tests', final_script)
+    ['--ignored-failures-path', api.json.input(base_failing_tests),
+      api.json.input(failing_tests)]
+  )
 
 
 def GenTests(api):
   SUCCESS_DATA = lambda: {}
 
   FAIL_DATA = lambda: {
     'webkit_tests (with patch)': {
       'json': {'output': {'crazy': ['data', 'format']}},
       '$R': 1
     },
@@ skipping 12 matching lines @@
             config_name='blink',
             root='src/third_party/WebKit',
           ),
           'step_mocks': step_mocks(),
           'mock': {
             'platform': {
               'name': plat
             }
           }
         }