libv8 5.3.332.38.5 → 5.6.326.50.0beta1

data/vendor/depot_tools/recipe_modules/rietveld/example.py

@@ -11,14 +11,20 @@ DEPS = [
 ]
 
 def RunSteps(api):
-  api.path['checkout'] = api.path['slave_build']
+  api.path['checkout'] = api.path['start_dir']
   api.rietveld.apply_issue('foo', 'bar', authentication='oauth2')
   api.rietveld.calculate_issue_root({'project': ['']})
 
 
 def GenTests(api):
-  yield (api.test('basic')
-         + api.properties(issue=1,
-                          patchset=1,
-                          rietveld='http://review_tool.url')
-         )
+  yield api.test('basic') + api.properties(
+      issue=1,
+      patchset=1,
+      rietveld='http://review_tool.url',
+  )
+  yield api.test('buildbot') + api.properties(
+      path_config='buildbot',
+      issue=1,
+      patchset=1,
+      rietveld='http://review_tool.url',
+  )

data/vendor/depot_tools/recipe_modules/tryserver/__init__.py

@@ -14,3 +14,7 @@ DEPS = [
   'rietveld',
   'recipe_engine/step',
 ]
+
+
+# TODO(phajdan): provide coverage (http://crbug.com/693058).
+DISABLE_STRICT_COVERAGE = True

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

@@ -11,7 +11,6 @@ from recipe_engine import recipe_api
 
 PATCH_STORAGE_RIETVELD = 'rietveld'
 PATCH_STORAGE_GIT = 'git'
-PATCH_STORAGE_SVN = 'svn'
 
 
 class TryserverApi(recipe_api.RecipeApi):
@@ -19,17 +18,11 @@ class TryserverApi(recipe_api.RecipeApi):
     super(TryserverApi, self).__init__(*args, **kwargs)
     self._failure_reasons = []
 
-  @property
-  def patch_url(self):
-    """Reads patch_url property and corrects it if needed."""
-    url = self.m.properties.get('patch_url')
-    return url
-
   @property
   def is_tryserver(self):
     """Returns true iff we can apply_issue or patch."""
-    return (self.can_apply_issue or self.is_patch_in_svn or
-            self.is_patch_in_git or self.is_gerrit_issue)
+    return (
+        self.can_apply_issue or self.is_patch_in_git or self.is_gerrit_issue)
 
   @property
   def can_apply_issue(self):
@@ -41,15 +34,13 @@ class TryserverApi(recipe_api.RecipeApi):
   @property
   def is_gerrit_issue(self):
     """Returns true iff the properties exist to match a Gerrit issue."""
+    if self.m.properties.get('patch_storage') == 'gerrit':
+      return True
+    # TODO(tandrii): remove this, once nobody is using buildbot Gerrit Poller.
     return ('event.patchSet.ref' in self.m.properties and
             'event.change.url' in self.m.properties and
             'event.change.id' in self.m.properties)
 
-  @property
-  def is_patch_in_svn(self):
-    """Returns true iff the properties exist to patch from a patch URL."""
-    return self.patch_url
-
   @property
   def is_patch_in_git(self):
     return (self.m.properties.get('patch_storage') == PATCH_STORAGE_GIT and
@@ -73,27 +64,6 @@ class TryserverApi(recipe_api.RecipeApi):
     self.m.step('apply patch', patch_cmd,
                       stdin=patch_content)
 
-  def apply_from_svn(self, cwd):
-    """Downloads patch from patch_url using svn-export and applies it"""
-    # TODO(nodir): accept these properties as parameters
-    patch_url = self.patch_url
-    root = cwd
-    if root is None:
-      issue_root = self.m.rietveld.calculate_issue_root()
-      root = self.m.path['checkout'].join(issue_root)
-
-    patch_file = self.m.raw_io.output('.diff')
-    ext = '.bat' if self.m.platform.is_win else ''
-    svn_cmd = ['svn' + ext, 'export', '--force', patch_url, patch_file]
-
-    result = self.m.step('download patch', svn_cmd,
-                         step_test_data=self.test_api.patch_content)
-    result.presentation.logs['patch.diff'] = (
-        result.raw_io.output.split('\n'))
-
-    patch_content = self.m.raw_io.input(result.raw_io.output)
-    self._apply_patch_step(patch_content=patch_content, root=root)
-
   def apply_from_git(self, cwd):
     """Downloads patch from given git repo and ref and applies it"""
     # TODO(nodir): accept these properties as parameters
@@ -101,17 +71,23 @@ class TryserverApi(recipe_api.RecipeApi):
     patch_ref = self.m.properties['patch_ref']
 
     patch_dir = self.m.path.mkdtemp('patch')
-    git_setup_py = self.m.path['build'].join('scripts', 'slave', 'git_setup.py')
+    try:
+      build_path = self.m.path['build']
+    except KeyError:
+      raise self.m.step.StepFailure(
+          'path["build"] is not defined. '
+          'Possibly this is a LUCI build. '
+          'tryserver.apply_from_git is not supported in LUCI builds.')
+
+    git_setup_py = build_path.join('scripts', 'slave', 'git_setup.py')
     git_setup_args = ['--path', patch_dir, '--url', patch_repo_url]
     patch_path = patch_dir.join('patch.diff')
 
     self.m.python('patch git setup', git_setup_py, git_setup_args)
-    self.m.git('fetch', 'origin', patch_ref,
-                name='patch fetch', cwd=patch_dir)
-    self.m.git('clean', '-f', '-d', '-x',
-                name='patch clean', cwd=patch_dir)
-    self.m.git('checkout', '-f', 'FETCH_HEAD',
-                name='patch git checkout', cwd=patch_dir)
+    with self.m.step.context({'cwd': patch_dir}):
+      self.m.git('fetch', 'origin', patch_ref, name='patch fetch')
+      self.m.git('clean', '-f', '-d', '-x', name='patch clean')
+      self.m.git('checkout', '-f', 'FETCH_HEAD', name='patch git checkout')
     self._apply_patch_step(patch_file=patch_path, root=cwd)
     self.m.step('remove patch', ['rm', '-rf', patch_dir])
 
@@ -123,8 +99,6 @@ class TryserverApi(recipe_api.RecipeApi):
 
     if self.can_apply_issue:
       return PATCH_STORAGE_RIETVELD
-    elif self.is_patch_in_svn:
-      return PATCH_STORAGE_SVN
 
   def maybe_apply_issue(self, cwd=None, authentication=None):
     """If we're a trybot, apply a codereview issue.
@@ -141,8 +115,6 @@ class TryserverApi(recipe_api.RecipeApi):
       return self.m.rietveld.apply_issue(
           self.m.rietveld.calculate_issue_root(),
           authentication=authentication)
-    elif storage == PATCH_STORAGE_SVN:
-      return self.apply_from_svn(cwd)
     elif storage == PATCH_STORAGE_GIT:
       return self.apply_from_git(cwd)
     else:
@@ -166,14 +138,15 @@ class TryserverApi(recipe_api.RecipeApi):
     # removed.
     if patch_root is None:
       return self._old_get_files_affected_by_patch()
-    if not kwargs.get('cwd'):
-      kwargs['cwd'] = self.m.path['slave_build'].join(patch_root)
-    step_result = self.m.git('diff', '--cached', '--name-only',
-                             name='git diff to analyze patch',
-                             stdout=self.m.raw_io.output(),
-                             step_test_data=lambda:
-                               self.m.raw_io.test_api.stream_output('foo.cc'),
-                             **kwargs)
+    with self.m.step.context({
+        'cwd': self.m.step.get_from_context(
+            'cwd', self.m.path['start_dir'].join(patch_root))}):
+      step_result = self.m.git('diff', '--cached', '--name-only',
+                               name='git diff to analyze patch',
+                               stdout=self.m.raw_io.output(),
+                               step_test_data=lambda:
+                                 self.m.raw_io.test_api.stream_output('foo.cc'),
+                               **kwargs)
     paths = [self.m.path.join(patch_root, p) for p in
              step_result.stdout.split()]
     if self.m.platform.is_win:
@@ -185,16 +158,16 @@ class TryserverApi(recipe_api.RecipeApi):
 
 
   def _old_get_files_affected_by_patch(self):
-    git_diff_kwargs = {}
+    context = {}
     issue_root = self.m.rietveld.calculate_issue_root()
     if issue_root:
-      git_diff_kwargs['cwd'] = self.m.path['checkout'].join(issue_root)
-    step_result = self.m.git('diff', '--cached', '--name-only',
-                             name='git diff to analyze patch',
-                             stdout=self.m.raw_io.output(),
-                             step_test_data=lambda:
-                               self.m.raw_io.test_api.stream_output('foo.cc'),
-                             **git_diff_kwargs)
+      context['cwd'] = self.m.path['checkout'].join(issue_root)
+    with self.m.step.context(context):
+      step_result = self.m.git('diff', '--cached', '--name-only',
+                               name='git diff to analyze patch',
+                               stdout=self.m.raw_io.output(),
+                               step_test_data=lambda:
+                                 self.m.raw_io.test_api.stream_output('foo.cc'))
     paths = step_result.stdout.split()
     if issue_root:
       paths = [self.m.path.join(issue_root, path) for path in paths]
@@ -273,14 +246,17 @@ class TryserverApi(recipe_api.RecipeApi):
     except self.m.step.StepFailure as e:
       self.add_failure_reason(e.reason)
 
-      failure_hash = hashlib.sha1()
-      failure_hash.update(self.m.json.dumps(self._failure_reasons))
-
-      step_result = self.m.step.active_result
-      step_result.presentation.properties['failure_hash'] = \
-          failure_hash.hexdigest()
-
-      raise
+      try:
+        step_result = self.m.step.active_result
+      except ValueError:
+        step_result = None
+      if step_result:
+        failure_hash = hashlib.sha1()
+        failure_hash.update(self.m.json.dumps(self._failure_reasons))
+        step_result.presentation.properties['failure_hash'] = (
+            failure_hash.hexdigest())
+
+      raise e
 
   def get_footers(self, patch_text=None):
     """Retrieves footers from the patch description.

data/vendor/depot_tools/recipe_modules/tryserver/example.expected/set_failure_hash_with_no_steps.json

@@ -0,0 +1,8 @@
+[
+  {
+    "name": "$result",
+    "reason": "boom!",
+    "recipe_result": null,
+    "status_code": 1
+  }
+]

data/vendor/depot_tools/recipe_modules/tryserver/example.expected/{with_svn_patch.json → with_gerrit_patch.json}

@@ -1,34 +1,4 @@
 [
-  {
-    "cmd": [
-      "svn",
-      "export",
-      "--force",
-      "svn://checkout.url",
-      "/path/to/tmp/diff"
-    ],
-    "name": "download patch",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@patch.diff@fake patch.diff content (line 1)@@@",
-      "@@@STEP_LOG_LINE@patch.diff@fake patch.diff content (line 2)@@@",
-      "@@@STEP_LOG_LINE@patch.diff@@@@",
-      "@@@STEP_LOG_END@patch.diff@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "patch",
-      "--dir",
-      "[SLAVE_BUILD]",
-      "--force",
-      "--forward",
-      "--remove-empty-files",
-      "--strip",
-      "0"
-    ],
-    "name": "apply patch",
-    "stdin": "fake patch.diff content (line 1)\nfake patch.diff content (line 2)\n"
-  },
   {
     "cmd": [
       "git",
@@ -36,7 +6,7 @@
       "--cached",
       "--name-only"
     ],
-    "cwd": "[SLAVE_BUILD]",
+    "cwd": "[START_DIR]",
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [

data/vendor/depot_tools/recipe_modules/tryserver/example.expected/with_gerrit_patch_deprecated.json

@@ -0,0 +1,39 @@
+[
+  {
+    "cmd": [
+      "git",
+      "diff",
+      "--cached",
+      "--name-only"
+    ],
+    "cwd": "[START_DIR]",
+    "name": "git diff to analyze patch",
+    "stdout": "/path/to/tmp/",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@files@foo.cc@@@",
+      "@@@STEP_LOG_END@files@@@",
+      "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@",
+      "@@@SET_BUILD_PROPERTY@subproject_tag@\"v8\"@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "import sys; sys.exit(1)"
+    ],
+    "name": "fail",
+    "~followup_annotations": [
+      "step returned non-zero exit code: 1",
+      "@@@STEP_TEXT@foo@@@",
+      "@@@STEP_FAILURE@@@",
+      "@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@"
+    ]
+  },
+  {
+    "name": "$result",
+    "reason": "Step('fail') failed with return_code 1",
+    "recipe_result": null,
+    "status_code": 1
+  }
+]

data/vendor/depot_tools/recipe_modules/tryserver/example.expected/with_git_patch.json

@@ -46,7 +46,7 @@
     "cmd": [
       "patch",
       "--dir",
-      "[SLAVE_BUILD]",
+      "[START_DIR]",
       "--force",
       "--forward",
       "--remove-empty-files",
@@ -72,7 +72,7 @@
       "--cached",
       "--name-only"
     ],
-    "cwd": "[SLAVE_BUILD]/v8",
+    "cwd": "[START_DIR]/v8",
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [

data/vendor/depot_tools/recipe_modules/tryserver/example.expected/with_git_patch_luci.json

@@ -0,0 +1,8 @@
+[
+  {
+    "name": "$result",
+    "reason": "path[\"build\"] is not defined. Possibly this is a LUCI build. tryserver.apply_from_git is not supported in LUCI builds.",
+    "recipe_result": null,
+    "status_code": 1
+  }
+]

data/vendor/depot_tools/recipe_modules/tryserver/example.expected/with_rietveld_patch.json

@@ -3,9 +3,9 @@
     "cmd": [
       "python",
       "-u",
-      "[DEPOT_TOOLS]/apply_issue.py",
+      "RECIPE_PACKAGE_REPO[depot_tools]/apply_issue.py",
       "-r",
-      "[SLAVE_BUILD]",
+      "[START_DIR]",
       "-i",
       "12853011",
       "-p",
@@ -52,7 +52,7 @@
       "--cached",
       "--name-only"
     ],
-    "cwd": "[SLAVE_BUILD]",
+    "cwd": "[START_DIR]",
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [

data/vendor/depot_tools/recipe_modules/tryserver/example.expected/with_rietveld_patch_new.json

@@ -3,9 +3,9 @@
     "cmd": [
       "python",
       "-u",
-      "[DEPOT_TOOLS]/apply_issue.py",
+      "RECIPE_PACKAGE_REPO[depot_tools]/apply_issue.py",
       "-r",
-      "[SLAVE_BUILD]",
+      "[START_DIR]",
       "-i",
       "12853011",
       "-p",
@@ -52,7 +52,7 @@
       "--cached",
       "--name-only"
     ],
-    "cwd": "[SLAVE_BUILD]/sub/project",
+    "cwd": "[START_DIR]/sub/project",
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [

data/vendor/depot_tools/recipe_modules/tryserver/example.expected/with_wrong_patch.json

@@ -17,7 +17,7 @@
       "--cached",
       "--name-only"
     ],
-    "cwd": "[SLAVE_BUILD]",
+    "cwd": "[START_DIR]",
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [

data/vendor/depot_tools/recipe_modules/tryserver/example.expected/with_wrong_patch_new.json

@@ -17,7 +17,7 @@
       "--cached",
       "--name-only"
     ],
-    "cwd": "[SLAVE_BUILD]\\sub\\project",
+    "cwd": "[START_DIR]\\sub\\project",
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [

data/vendor/depot_tools/recipe_modules/tryserver/example.py

@@ -15,7 +15,11 @@ DEPS = [
 
 
 def RunSteps(api):
-  api.path['checkout'] = api.path['slave_build']
+  if api.properties.get('set_failure_hash_with_no_steps'):
+    with api.tryserver.set_failure_hash():
+      raise api.step.StepFailure('boom!')
+
+  api.path['checkout'] = api.path['start_dir']
   if api.properties.get('patch_text'):
     api.step('patch_text test', [
         'echo', str(api.tryserver.get_footers(api.properties['patch_text']))])
@@ -44,17 +48,22 @@ def RunSteps(api):
 
 def GenTests(api):
   description_step = api.override_step_data(
-      'git_cl description', stdout=api.raw_io.output('foobar'))
-  yield (api.test('with_svn_patch') +
-         api.properties(patch_url='svn://checkout.url'))
-
+      'git_cl description', stdout=api.raw_io.output_text('foobar'))
   yield (api.test('with_git_patch') +
          api.properties(
+              path_config='buildbot',
               patch_storage='git',
               patch_project='v8',
               patch_repo_url='http://patch.url/',
               patch_ref='johndoe#123.diff'))
 
+  yield (api.test('with_git_patch_luci') +
+         api.properties(
+             patch_storage='git',
+             patch_project='v8',
+             patch_repo_url='http://patch.url/',
+             patch_ref='johndoe#123.diff'))
+
   yield (api.test('with_rietveld_patch') +
          api.properties.tryserver() +
          description_step)
@@ -65,6 +74,24 @@ def GenTests(api):
          api.properties.tryserver(test_patch_root='sub/project') +
          description_step)
 
+  yield api.test('with_gerrit_patch_deprecated') + api.properties.tryserver(
+      patch_project='infra/infra',
+      gerrit='https://chromium-review.googlesource.com',
+      patch_storage='gerrit',
+      repository='https://chromium.googlesource.com/infra/infra',
+      rietveld=None,
+      **{
+        'event.change.id': 'infra%2Finfra~master~Ideadbeaf',
+        'event.change.number': 338811,
+        'event.change.url':
+          'https://chromium-review.googlesource.com/#/c/338811',
+        'event.patchSet.ref': 'refs/changes/11/338811/3',
+      }
+  )
+
+  yield (api.test('with_gerrit_patch') +
+         api.properties.tryserver(gerrit_project='infra/infra'))
+
   yield (api.test('with_wrong_patch_new') + api.platform('win', 32) +
          api.properties(test_patch_root='sub\\project'))
 
@@ -80,3 +107,6 @@ def GenTests(api):
              'parse description (2)',
              api.json.output({'Foo': ['bar']}))
   )
+
+  yield (api.test('set_failure_hash_with_no_steps') +
+         api.properties(set_failure_hash_with_no_steps=True))