libv8 5.3.332.38.5 → 5.6.326.50.0beta1

data/vendor/depot_tools/recipe_modules/bot_update/test_api.py

@@ -3,69 +3,58 @@
 # found in the LICENSE file.
 
 import hashlib
-import os
 import struct
-import sys
 from recipe_engine import recipe_test_api
 
-# TODO(phajdan.jr): Clean up this somewhat ugly import.
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'resources'))
-import bot_update
-
 
 class BotUpdateTestApi(recipe_test_api.RecipeTestApi):
-  def output_json(self, master, builder, slave, root, first_sln,
-                  revision_mapping, force=False, fail_patch=False,
+  def output_json(self, root, first_sln, revision_mapping, fail_patch=False,
                   output_manifest=False, fixed_revisions=None):
     """Deterministically synthesize json.output test data for gclient's
     --output-json option.
     """
-    active = bot_update.check_valid_host(master, builder, slave) or force
-
     output = {
-        'did_run': active,
+        'did_run': True,
         'patch_failure': False
     }
 
-    # Add in extra json output if active.
-    if active:
-      properties = {
-          property_name: self.gen_revision(project_name)
-          for project_name, property_name in revision_mapping.iteritems()
-      }
-      properties.update({
-          '%s_cp' % property_name: ('refs/heads/master@{#%s}' %
-                                    self.gen_commit_position(project_name))
-          for project_name, property_name in revision_mapping.iteritems()
-      })
+    properties = {
+        property_name: self.gen_revision(project_name)
+        for project_name, property_name in revision_mapping.iteritems()
+    }
+    properties.update({
+        '%s_cp' % property_name: ('refs/heads/master@{#%s}' %
+                                  self.gen_commit_position(project_name))
+        for project_name, property_name in revision_mapping.iteritems()
+    })
 
-      output.update({
-          'patch_root': root or first_sln,
-          'root': first_sln,
-          'properties': properties,
-          'step_text': 'Some step text'
-      })
+    output.update({
+        'patch_root': root or first_sln,
+        'root': first_sln,
+        'properties': properties,
+        'step_text': 'Some step text'
+    })
 
-      if output_manifest:
-        output.update({
-          'manifest': {
-            project_name: {
-              'repository': 'https://fake.org/%s.git' % project_name,
-              'revision': self.gen_revision(project_name),
-            }
-            for project_name in revision_mapping
+    if output_manifest:
+      output.update({
+        'manifest': {
+          project_name: {
+            'repository': 'https://fake.org/%s.git' % project_name,
+            'revision': self.gen_revision(project_name),
           }
-        })
+          for project_name in revision_mapping
+        }
+      })
 
-      if fixed_revisions:
-        output['fixed_revisions'] = fixed_revisions
+    if fixed_revisions:
+      output['fixed_revisions'] = fixed_revisions
 
-      if fail_patch:
-        output['log_lines'] = [('patch error', 'Patch failed to apply'),]
-        output['patch_failure'] = True
-        output['patch_apply_return_code'] = 1
-        if fail_patch == 'download':
-          output['patch_apply_return_code'] = 3
+    if fail_patch:
+      output['log_lines'] = [('patch error', 'Patch failed to apply'),]
+      output['patch_failure'] = True
+      output['patch_apply_return_code'] = 1
+      if fail_patch == 'download':
+        output['patch_apply_return_code'] = 3
     return self.m.json.output(output)
 
   @staticmethod

data/vendor/depot_tools/recipe_modules/cipd/api.py

@@ -6,12 +6,26 @@ from recipe_engine import recipe_api
 
 
 class CIPDApi(recipe_api.RecipeApi):
-  """CIPDApi provides support for CIPD."""
+  """CIPDApi provides basic support for CIPD.
+
+  This assumes that `cipd` (or `cipd.exe` on windows) has been installed
+  somewhere in $PATH. This will be true if you use depot_tools, or if your
+  recipe is running inside of chrome-infrastructure's systems (buildbot,
+  swarming).
+  """
   def __init__(self, *args, **kwargs):
     super(CIPDApi, self).__init__(*args, **kwargs)
-    self._cipd_executable = None
-    self._cipd_version = None
     self._cipd_credentials = None
+    self._executable = None
+
+  def initialize(self):
+    self._executable = 'cipd'
+    if self.m.platform.is_win:
+      self._executable += '.exe'
+
+  @property
+  def executable(self):
+    return self._executable
 
   def set_service_account_credentials(self, path):
     self._cipd_credentials = path
@@ -40,66 +54,37 @@ class CIPDApi(recipe_api.RecipeApi):
         }[self.m.platform.bits],
     )
 
-  def install_client(self, step_name='install cipd', version=None):
-    """Ensures the client is installed.
-
-    If you specify version as a hash, make sure its correct platform.
-    """
-    # TODO(seanmccullough): clean up older CIPD installations.
-    step = self.m.python(
-        name=step_name,
-        script=self.resource('bootstrap.py'),
-        args=[
-          '--platform', self.platform_suffix(),
-          '--dest-directory', self.m.path['slave_build'].join('cipd'),
-          '--json-output', self.m.json.output(),
-        ] +
-        (['--version', version] if version else []),
-        step_test_data=lambda: self.test_api.example_install_client(version)
-    )
-    self._cipd_executable = step.json.output['executable']
-
-    step.presentation.step_text = (
-        'cipd instance_id: %s' % step.json.output['instance_id'])
-    return step
-
-  def get_executable(self):
-    return self._cipd_executable
-
   def build(self, input_dir, output_package, package_name, install_mode=None):
-    assert self._cipd_executable
     assert not install_mode or install_mode in ['copy', 'symlink']
     return self.m.step(
         'build %s' % self.m.path.basename(package_name),
         [
-          self._cipd_executable,
+          self.executable,
           'pkg-build',
-          '--in', input_dir,
-          '--name', package_name,
-          '--out', output_package,
-          '--json-output', self.m.json.output(),
+          '-in', input_dir,
+          '-name', package_name,
+          '-out', output_package,
+          '-json-output', self.m.json.output(),
         ] + (
-          ['--install-mode', install_mode] if install_mode else []
+          ['-install-mode', install_mode] if install_mode else []
         ),
         step_test_data=lambda: self.test_api.example_build(package_name)
     )
 
   def register(self, package_name, package_path, refs=None, tags=None):
-    assert self._cipd_executable
-
     cmd = [
-      self._cipd_executable,
+      self.executable,
       'pkg-register', package_path,
-      '--json-output', self.m.json.output(),
+      '-json-output', self.m.json.output(),
     ]
     if self._cipd_credentials:
-      cmd.extend(['--service-account-json', self._cipd_credentials])
+      cmd.extend(['-service-account-json', self._cipd_credentials])
     if refs:
       for ref in refs:
-        cmd.extend(['--ref', ref])
+        cmd.extend(['-ref', ref])
     if tags:
       for tag, value in sorted(tags.items()):
-        cmd.extend(['--tag', '%s:%s' % (tag, value)])
+        cmd.extend(['-tag', '%s:%s' % (tag, value)])
     return self.m.step(
         'register %s' % package_name,
         cmd,
@@ -111,21 +96,20 @@ class CIPDApi(recipe_api.RecipeApi):
 
     This builds and uploads the package in one step.
     """
-    assert self._cipd_executable
     cmd = [
-      self._cipd_executable,
+      self.executable,
       'create',
-      '--pkg-def', pkg_def,
-      '--json-output', self.m.json.output(),
+      '-pkg-def', pkg_def,
+      '-json-output', self.m.json.output(),
     ]
     if self._cipd_credentials:
-      cmd.extend(['--service-account-json', self._cipd_credentials])
+      cmd.extend(['-service-account-json', self._cipd_credentials])
     if refs:
       for ref in refs:
-        cmd.extend(['--ref', ref])
+        cmd.extend(['-ref', ref])
     if tags:
       for tag, value in sorted(tags.items()):
-        cmd.extend(['--tag', '%s:%s' % (tag, value)])
+        cmd.extend(['-tag', '%s:%s' % (tag, value)])
     return self.m.step('create %s' % self.m.path.basename(pkg_def), cmd)
 
   def ensure(self, root, packages):
@@ -138,38 +122,34 @@ class CIPDApi(recipe_api.RecipeApi):
     If installing a package requires credentials, call
     ``set_service_account_credentials`` before calling this function.
     """
-    assert self._cipd_executable
-
     package_list = ['%s %s' % (name, version)
                     for name, version in sorted(packages.items())]
-    list_data = self.m.raw_io.input('\n'.join(package_list))
+    ensure_file = self.m.raw_io.input('\n'.join(package_list))
     cmd = [
-      self._cipd_executable,
+      self.executable,
       'ensure',
-      '--root', root,
-      '--list', list_data,
-      '--json-output', self.m.json.output(),
+      '-root', root,
+      '-ensure-file', ensure_file,
+      '-json-output', self.m.json.output(),
     ]
     if self._cipd_credentials:
-      cmd.extend(['--service-account-json', self._cipd_credentials])
-    return self.m.step(
+      cmd.extend(['-service-account-json', self._cipd_credentials])
+    self.m.step(
         'ensure_installed', cmd,
         step_test_data=lambda: self.test_api.example_ensure(packages)
     )
 
   def set_tag(self, package_name, version, tags):
-    assert self._cipd_executable
-
     cmd = [
-      self._cipd_executable,
+      self.executable,
       'set-tag', package_name,
-      '--version', version,
-      '--json-output', self.m.json.output(),
+      '-version', version,
+      '-json-output', self.m.json.output(),
     ]
     if self._cipd_credentials:
-      cmd.extend(['--service-account-json', self._cipd_credentials])
+      cmd.extend(['-service-account-json', self._cipd_credentials])
     for tag, value in sorted(tags.items()):
-      cmd.extend(['--tag', '%s:%s' % (tag, value)])
+      cmd.extend(['-tag', '%s:%s' % (tag, value)])
 
     return self.m.step(
       'cipd set-tag %s' % package_name,
@@ -180,18 +160,16 @@ class CIPDApi(recipe_api.RecipeApi):
     )
 
   def set_ref(self, package_name, version, refs):
-    assert self._cipd_executable
-
     cmd = [
-      self._cipd_executable,
+      self.executable,
       'set-ref', package_name,
-      '--version', version,
-      '--json-output', self.m.json.output(),
+      '-version', version,
+      '-json-output', self.m.json.output(),
     ]
     if self._cipd_credentials:
-      cmd.extend(['--service-account-json', self._cipd_credentials])
+      cmd.extend(['-service-account-json', self._cipd_credentials])
     for r in refs:
-      cmd.extend(['--ref', r])
+      cmd.extend(['-ref', r])
 
     return self.m.step(
       'cipd set-ref %s' % package_name,
@@ -202,17 +180,16 @@ class CIPDApi(recipe_api.RecipeApi):
     )
 
   def search(self, package_name, tag):
-    assert self._cipd_executable
     assert ':' in tag, 'tag must be in a form "k:v"'
 
     cmd = [
-      self._cipd_executable,
+      self.executable,
       'search', package_name,
-      '--tag', tag,
-      '--json-output', self.m.json.output(),
+      '-tag', tag,
+      '-json-output', self.m.json.output(),
     ]
     if self._cipd_credentials:
-      cmd.extend(['--service-account-json', self._cipd_credentials])
+      cmd.extend(['-service-account-json', self._cipd_credentials])
 
     return self.m.step(
       'cipd search %s %s' % (package_name, tag),
@@ -222,16 +199,14 @@ class CIPDApi(recipe_api.RecipeApi):
 
   def describe(self, package_name, version,
                test_data_refs=None, test_data_tags=None):
-    assert self._cipd_executable
-
     cmd = [
-      self._cipd_executable,
+      self.executable,
       'describe', package_name,
-      '--version', version,
-      '--json-output', self.m.json.output(),
+      '-version', version,
+      '-json-output', self.m.json.output(),
     ]
     if self._cipd_credentials:
-      cmd.extend(['--service-account-json', self._cipd_credentials])
+      cmd.extend(['-service-account-json', self._cipd_credentials])
 
     return self.m.step(
       'cipd describe %s' % package_name,

data/vendor/depot_tools/recipe_modules/cipd/example.expected/basic.json

@@ -1,61 +1,15 @@
 [
   {
     "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::cipd]/resources/bootstrap.py",
-      "--platform",
-      "linux-amd64",
-      "--dest-directory",
-      "[SLAVE_BUILD]/cipd",
-      "--json-output",
-      "/path/to/tmp/json"
-    ],
-    "name": "install cipd",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[depot_tools::cipd]/resources/bootstrap.py",
-      "--platform",
-      "linux-amd64",
-      "--dest-directory",
-      "[SLAVE_BUILD]/cipd",
-      "--json-output",
-      "/path/to/tmp/json",
-      "--version",
-      "deadbeaf"
-    ],
-    "name": "install cipd (2)",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[SLAVE_BUILD]/cipd/cipd",
+      "cipd",
       "ensure",
-      "--root",
-      "[SLAVE_BUILD]/packages",
-      "--list",
+      "-root",
+      "[START_DIR]/packages",
+      "-ensure-file",
       "public/package/linux-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d",
-      "--json-output",
+      "-json-output",
       "/path/to/tmp/json",
-      "--service-account-json",
+      "-service-account-json",
       "/creds/service_accounts/service-account-cipd-builder.json"
     ],
     "name": "ensure_installed",
@@ -73,14 +27,14 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/cipd/cipd",
+      "cipd",
       "search",
       "public/package/linux-amd64",
-      "--tag",
+      "-tag",
       "git_revision:40-chars-long-hash",
-      "--json-output",
+      "-json-output",
       "/path/to/tmp/json",
-      "--service-account-json",
+      "-service-account-json",
       "/creds/service_accounts/service-account-cipd-builder.json"
     ],
     "name": "cipd search public/package/linux-amd64 git_revision:40-chars-long-hash",
@@ -98,14 +52,14 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/cipd/cipd",
+      "cipd",
       "describe",
       "public/package/linux-amd64",
-      "--version",
+      "-version",
       "40-chars-fake-of-the-package-instance_id",
-      "--json-output",
+      "-json-output",
       "/path/to/tmp/json",
-      "--service-account-json",
+      "-service-account-json",
       "/creds/service_accounts/service-account-cipd-builder.json"
     ],
     "name": "cipd describe public/package/linux-amd64",
@@ -149,15 +103,15 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/cipd/cipd",
+      "cipd",
       "ensure",
-      "--root",
-      "[SLAVE_BUILD]/packages",
-      "--list",
+      "-root",
+      "[START_DIR]/packages",
+      "-ensure-file",
       "private/package/linux-amd64 latest\npublic/package/linux-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d",
-      "--json-output",
+      "-json-output",
       "/path/to/tmp/json",
-      "--service-account-json",
+      "-service-account-json",
       "fake-credentials.json"
     ],
     "name": "ensure_installed (2)",
@@ -179,14 +133,14 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/cipd/cipd",
+      "cipd",
       "search",
       "private/package/linux-amd64",
-      "--tag",
+      "-tag",
       "key:value",
-      "--json-output",
+      "-json-output",
       "/path/to/tmp/json",
-      "--service-account-json",
+      "-service-account-json",
       "fake-credentials.json"
     ],
     "name": "cipd search private/package/linux-amd64 key:value",
@@ -204,14 +158,14 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/cipd/cipd",
+      "cipd",
       "describe",
       "private/package/linux-amd64",
-      "--version",
+      "-version",
       "40-chars-fake-of-the-package-instance_id",
-      "--json-output",
+      "-json-output",
       "/path/to/tmp/json",
-      "--service-account-json",
+      "-service-account-json",
       "fake-credentials.json"
     ],
     "name": "cipd describe private/package/linux-amd64",
@@ -250,15 +204,15 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/cipd/cipd",
+      "cipd",
       "pkg-build",
-      "--in",
+      "-in",
       "fake-input-dir",
-      "--name",
+      "-name",
       "infra/fake-package",
-      "--out",
+      "-out",
       "fake-package-path",
-      "--json-output",
+      "-json-output",
       "/path/to/tmp/json"
     ],
     "name": "build fake-package",
@@ -274,17 +228,17 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/cipd/cipd",
+      "cipd",
       "pkg-build",
-      "--in",
+      "-in",
       "fake-input-dir",
-      "--name",
+      "-name",
       "infra/fake-package",
-      "--out",
+      "-out",
       "fake-package-path",
-      "--json-output",
+      "-json-output",
       "/path/to/tmp/json",
-      "--install-mode",
+      "-install-mode",
       "copy"
     ],
     "name": "build fake-package (2)",
@@ -300,20 +254,20 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/cipd/cipd",
+      "cipd",
       "pkg-register",
       "fake-package-path",
-      "--json-output",
+      "-json-output",
       "/path/to/tmp/json",
-      "--service-account-json",
+      "-service-account-json",
       "fake-credentials.json",
-      "--ref",
+      "-ref",
       "fake-ref-1",
-      "--ref",
+      "-ref",
       "fake-ref-2",
-      "--tag",
+      "-tag",
       "fake_tag_1:fake_value_1",
-      "--tag",
+      "-tag",
       "fake_tag_2:fake_value_2"
     ],
     "name": "register infra/fake-package",
@@ -329,21 +283,21 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/cipd/cipd",
+      "cipd",
       "create",
-      "--pkg-def",
-      "[SLAVE_BUILD]/fake-package.yaml",
-      "--json-output",
+      "-pkg-def",
+      "[START_DIR]/fake-package.yaml",
+      "-json-output",
       "/path/to/tmp/json",
-      "--service-account-json",
+      "-service-account-json",
       "fake-credentials.json",
-      "--ref",
+      "-ref",
       "fake-ref-1",
-      "--ref",
+      "-ref",
       "fake-ref-2",
-      "--tag",
+      "-tag",
       "fake_tag_1:fake_value_1",
-      "--tag",
+      "-tag",
       "fake_tag_2:fake_value_2"
     ],
     "name": "create fake-package.yaml",
@@ -354,18 +308,18 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/cipd/cipd",
+      "cipd",
       "set-tag",
       "fake-package",
-      "--version",
+      "-version",
       "long/weird/ref/which/doesn/not/fit/into/40chars",
-      "--json-output",
+      "-json-output",
       "/path/to/tmp/json",
-      "--service-account-json",
+      "-service-account-json",
       "fake-credentials.json",
-      "--tag",
+      "-tag",
       "dead:beaf",
-      "--tag",
+      "-tag",
       "more:value"
     ],
     "name": "cipd set-tag fake-package",
@@ -384,18 +338,18 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/cipd/cipd",
+      "cipd",
       "set-ref",
       "fake-package",
-      "--version",
+      "-version",
       "latest",
-      "--json-output",
+      "-json-output",
       "/path/to/tmp/json",
-      "--service-account-json",
+      "-service-account-json",
       "fake-credentials.json",
-      "--ref",
+      "-ref",
       "any",
-      "--ref",
+      "-ref",
       "some"
     ],
     "name": "cipd set-ref fake-package",
@@ -414,14 +368,14 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/cipd/cipd",
+      "cipd",
       "search",
       "fake-package/linux-amd64",
-      "--tag",
+      "-tag",
       "dead:beaf",
-      "--json-output",
+      "-json-output",
       "/path/to/tmp/json",
-      "--service-account-json",
+      "-service-account-json",
       "fake-credentials.json"
     ],
     "name": "cipd search fake-package/linux-amd64 dead:beaf",