Let bot_update recipe api force usage of bot_update.

Let bot_update recipe api force usage of bot_update.

This will let us turn bot_update on on a per-recipe basis, rather than just
a per-master or per-builder basis.

R=hinoka@chromium.org

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=271540

[hinoka, 2014-05-16 23:33:48]

https://codereview.chromium.org/288843003/diff/1/scripts/slave/recipe_modules...
File scripts/slave/recipe_modules/bot_update/api.py (right):

https://codereview.chromium.org/288843003/diff/1/scripts/slave/recipe_modules...
scripts/slave/recipe_modules/bot_update/api.py:121: if force:  # pragma: no
cover
Lets actually add coverage for this, via a fake builder.

[agable, 2014-05-19 16:25:19]

https://codereview.chromium.org/288843003/diff/1/scripts/slave/recipe_modules...
File scripts/slave/recipe_modules/bot_update/api.py (right):

https://codereview.chromium.org/288843003/diff/1/scripts/slave/recipe_modules...
scripts/slave/recipe_modules/bot_update/api.py:121: if force:  # pragma: no
cover
On 2014/05/16 23:33:48, hinoka wrote:
> Lets actually add coverage for this, via a fake builder.

Done, PTAL.

[hinoka, 2014-05-19 21:37:35]

lgtm % comment

https://codereview.chromium.org/288843003/diff/20001/scripts/slave/recipe_mod...
File scripts/slave/recipe_modules/bot_update/test_api.py (right):

https://codereview.chromium.org/288843003/diff/20001/scripts/slave/recipe_mod...
scripts/slave/recipe_modules/bot_update/test_api.py:24: output.update({'force':
True})
Adding it to the output isn't necessary.  Anyone consuming the output would
already know whether or not --force is passed in.

Also this doesn't match what bot_update emits.

[agable, 2014-05-20 01:31:32]

The CQ bit was checked by agable@chromium.org

[commit-bot: I haz the power, 2014-05-20 01:31:50]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/agable@chromium.org/288843003/40001

[commit-bot: I haz the power, 2014-05-20 01:31:54]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-20 01:31:54]

Failed to apply patch for build/scripts/slave/recipe_modules/bot_update/api.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/scripts/slave/recipe_modules/bot_update/api.py
  Hunk #1 FAILED at 57.
  Hunk #2 succeeded at 119 (offset 1 line).
  1 out of 2 hunks FAILED -- saving rejects to file
build/scripts/slave/recipe_modules/bot_update/api.py.rej

Patch:       build/scripts/slave/recipe_modules/bot_update/api.py
Index: scripts/slave/recipe_modules/bot_update/api.py
diff --git build/scripts/slave/recipe_modules/bot_update/api.py
build/scripts/slave/recipe_modules/bot_update/api.py
index
fe040e7945459da0abaedb24408db01e1a9172d2..1ff84953c5a4434fe65f895b1322ca4dc36f5b58
100644
--- a/build/scripts/slave/recipe_modules/bot_update/api.py
+++ b/build/scripts/slave/recipe_modules/bot_update/api.py
@@ -57,7 +57,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
 
   def ensure_checkout(self, gclient_config=None, suffix=None,
                       patch=True, ref=None, update_presentation=True,
-                      **kwargs):
+                      force=False, **kwargs):
     # We can re-use the gclient spec from the gclient module, since all the
     # data bot_update needs is already configured into the gclient spec.
     cfg = gclient_config or self.m.gclient.c
@@ -118,11 +118,14 @@ class BotUpdateApi(recipe_api.RecipeApi):
     cmd = [item for flag_set in flags
            for item in flag_set if flag_set[1] is not None]
 
+    if force:
+      cmd.append('--force')
+
     # Inject Json output for testing.
     git_mode = self.m.properties.get('mastername') in GIT_MASTERS
     first_sln = cfg.solutions[0].name
     step_test_data = lambda: self.test_api.output_json(
-        master, builder, slave, root, first_sln, rev_map, git_mode)
+        master, builder, slave, root, first_sln, rev_map, git_mode, force)
 
     def followup_fn(step_result):
       if update_presentation:

[agable, 2014-05-20 02:27:24]

The CQ bit was checked by agable@chromium.org

[commit-bot: I haz the power, 2014-05-20 02:27:37]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/agable@chromium.org/288843003/60001

[commit-bot: I haz the power, 2014-05-20 02:28:32]

Change committed as 271540