Add step generator protocol, remove annotated_checkout, remove script.

scripts/slave/unittests/recipe_util_test.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 import test_env  # pylint: disable=W0611
+import coverage
 import unittest
 import mock  # pylint: disable=F0401
 with mock.patch('os.getcwd') as mock_getcwd:
   mock_getcwd.return_value = '/b/build/slave/fake_slave/build'
   from slave import recipe_util  # pylint: disable=F0401
 
 class RecipeUtilGlobalTest(unittest.TestCase):
 
   def setUp(self):
     self.ru = recipe_util
@@ skipping 48 matching lines @@
     self.assertEqual(self.s.ChromiumGitURL('chromium', 'src'),
                      'https://chromium.googlesource.com/chromium/src')
 
   def test_mirror_only(self):
     self.assertEqual(self.s_m.mirror_only(['foobar', 'item']),
                      ['foobar', 'item'])
     self.assertEqual(self.s.mirror_only(['foobar', 'item']), [])
 
   def test_chromium_common_spec(self):
     self.assertEqual(
-      self.s_m.gclient_common_spec('chromium'), {'solutions': [
+      self.ru.GCLIENT_COMMON_SPECS['chromium'](self.s_m), {'solutions': [
       {
         'name' : 'src',
         'url' : 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src',
         'deps_file' : 'DEPS',
         'managed' : True,
         'custom_deps': {
           'src/third_party/WebKit/LayoutTests': None,
           'src/webkit/data/layout_tests/LayoutTests': None},
         'custom_vars': {
           'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s',
           'nacl_trunk': 'http://src.chromium.org/native_client/trunk',
           'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s',
           'webkit_trunk':
           'svn://svn-mirror.golo.chromium.org/blink/trunk'},
         'safesync_url': '',
       }]})
     self.assertEqual(
-      self.s.gclient_common_spec('chromium'), {'solutions': [
+      self.ru.GCLIENT_COMMON_SPECS['chromium'](self.s), {'solutions': [
       {
         'name' : 'src',
         'url' : 'https://src.chromium.org/chrome/trunk/src',
         'deps_file' : 'DEPS',
         'managed' : True,
         'custom_deps': {
           'src/third_party/WebKit/LayoutTests': None,
           'src/webkit/data/layout_tests/LayoutTests': None},
         'custom_vars': {},
         'safesync_url': '',
       }]})
 
   def test_chromium_tools_build(self):
     tools_build = {'solutions': [
       {
         'name': 'build',
         'url': 'https://chromium.googlesource.com/chromium/tools/build.git',
         'managed' : True,
         'deps_file' : '.DEPS.git',
       }]}
-    self.assertEqual(self.s_m.gclient_common_spec('tools_build'),
+    self.assertEqual(self.ru.GCLIENT_COMMON_SPECS['tools_build'](self.s_m),
                      tools_build)
-    self.assertEqual(self.s.gclient_common_spec('tools_build'),
+    self.assertEqual(self.ru.GCLIENT_COMMON_SPECS['tools_build'](self.s),
                      tools_build)
 
 
 class RecipeUtilStepsTest(unittest.TestCase):
 
   def setUp(self):
     self.ru = recipe_util
     self.s = self.ru.Steps({
       'issue': '12345',
       'patchset': '1',
       'rietveld': 'https://rietveld.org'
     })
 
   def test_step(self):
     self.assertEqual(
       self.s.step('foobar', ['this', 'is', 'command']),
       {'name': 'foobar', 'cmd': ['this', 'is', 'command']})
 
     self.assertRaises(AssertionError,
         lambda: self.s.step('foobar', 'I am a shell command', shell=True))
 
   def test_apply_issue_step(self):
     self.assertEquals(
-      self.s.apply_issue_step(),
+      self.s.apply_issue(),
       {'name': 'apply_issue',
        'cmd': [
          '/b/depot_tools/apply_issue',
          '-r', '%(CheckoutRootPlaceholder)s',
          '-i', '12345',
          '-p', '1',
          '-s', 'https://rietveld.org',
          '-e', 'commit-bot@chromium.org']})
     self.assertEquals(
-      self.s.apply_issue_step('foobar', 'other'),
+      self.s.apply_issue('foobar', 'other'),
       {'name': 'apply_issue',
        'cmd': [
          '/b/depot_tools/apply_issue',
          '-r', '%(CheckoutRootPlaceholder)s/foobar/other',
          '-i', '12345',
          '-p', '1',
          '-s', 'https://rietveld.org',
          '-e', 'commit-bot@chromium.org']})
 
-  def test_git_step(self):
+  def test_git(self):
     self.assertEquals(
-      self.s.git_step('rebase', '--onto', 'master'),
+      self.s.git('rebase', '--onto', 'master'),
       {
         'name': 'git rebase',
         'cmd': [
           'git', '--work-tree', '%(CheckoutRootPlaceholder)s',
                  '--git-dir', '%(CheckoutRootPlaceholder)s/.git',
                  'rebase', '--onto', 'master']})
 
     # git config gets special treatment for the name
     self.assertEquals(
-      self.s.git_step('config', 'user.name', 'dudeface'),
+      self.s.git('config', 'user.name', 'dudeface'),
       {
         'name': 'git config user.name',
         'cmd': [
           'git', '--work-tree', '%(CheckoutRootPlaceholder)s',
                  '--git-dir', '%(CheckoutRootPlaceholder)s/.git',
                  'config', 'user.name', 'dudeface']})
 
 
 if __name__ == '__main__':
-  unittest.main()
+  recipe_util_file = recipe_util.__file__
+  if recipe_util_file[-1] == 'c':
+    recipe_util_file = recipe_util_file[:-1]
+  cov = coverage.coverage(include=recipe_util_file)
+  cov.start()
+  try:
+    unittest.main()
+  finally:
+    cov.stop()
+    cov.report()