Bot update cleanup
* Remove activation check * Remove messages * Remove deps2git * Remove build_internal pointer by: ** Moving chrome svn url into bot_update.py (This isn't secret anyways.) ** Move patch.exe into depot_tools (No reason this should've been internal...) ** Default everything to active, so no need for checks anyways. BUG= Review URL: https://codereview.chromium.org/1686273002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298809 0039d316-1c4b-4281-b951-d872f2087c98changes/01/332501/1
hinoka@chromium.org
9 years ago
parent
a1afbb986d
commit
b0f36188b2
@ -1,44 +0,0 @@
|
||||
[
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
||||
"--master",
|
||||
"experimental",
|
||||
"--builder",
|
||||
"Experimental Builder",
|
||||
"--slave",
|
||||
"somehost",
|
||||
"--spec",
|
||||
"cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
|
||||
"--root",
|
||||
"src",
|
||||
"--revision_mapping_file",
|
||||
"{\"src\": \"got_cr_revision\"}",
|
||||
"--git-cache-dir",
|
||||
"[GIT_CACHE]",
|
||||
"--output_json",
|
||||
"/path/to/tmp/json",
|
||||
"--revision",
|
||||
"src@HEAD"
|
||||
],
|
||||
"cwd": "[SLAVE_BUILD]",
|
||||
"env": {
|
||||
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
|
||||
},
|
||||
"name": "bot_update",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_LOG_LINE@json.output@{@@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ \"did_run\": false, @@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false@@@",
|
||||
"@@@STEP_LOG_LINE@json.output@}@@@",
|
||||
"@@@STEP_LOG_END@json.output@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "$result",
|
||||
"recipe_result": null,
|
||||
"status_code": 0
|
||||
}
|
||||
]
|
||||
@ -1,60 +0,0 @@
|
||||
[
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
||||
"--master",
|
||||
"experimental.svn",
|
||||
"--builder",
|
||||
"Experimental SVN Builder",
|
||||
"--slave",
|
||||
"somehost",
|
||||
"--spec",
|
||||
"cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
|
||||
"--root",
|
||||
"src",
|
||||
"--revision_mapping_file",
|
||||
"{\"src\": \"got_cr_revision\"}",
|
||||
"--git-cache-dir",
|
||||
"[GIT_CACHE]",
|
||||
"--output_json",
|
||||
"/path/to/tmp/json",
|
||||
"--revision",
|
||||
"src@HEAD",
|
||||
"--force"
|
||||
],
|
||||
"cwd": "[SLAVE_BUILD]",
|
||||
"env": {
|
||||
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
|
||||
},
|
||||
"name": "bot_update",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_TEXT@Some step text@@@",
|
||||
"@@@STEP_LOG_LINE@json.output@{@@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ }, @@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ \"got_cr_revision\": 170242, @@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ \"got_cr_revision_git\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ }, @@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
|
||||
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
|
||||
"@@@STEP_LOG_LINE@json.output@}@@@",
|
||||
"@@@STEP_LOG_END@json.output@@@",
|
||||
"@@@SET_BUILD_PROPERTY@got_cr_revision@170242@@@",
|
||||
"@@@SET_BUILD_PROPERTY@got_cr_revision_git@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
|
||||
"@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "$result",
|
||||
"recipe_result": null,
|
||||
"status_code": 0
|
||||
}
|
||||
]
|
||||
Binary file not shown.
@ -0,0 +1,261 @@
|
||||
#!/usr/bin/env python
|
||||
# Copyright (c) 2015 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 codecs
|
||||
import copy
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
|
||||
ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
RESOURCE_DIR = os.path.join(
|
||||
ROOT_DIR, 'recipe_modules', 'bot_update', 'resources')
|
||||
|
||||
sys.path.insert(0, RESOURCE_DIR)
|
||||
sys.platform = 'linux2' # For consistency, ya know?
|
||||
import bot_update
|
||||
|
||||
DEFAULT_PARAMS = {
|
||||
'solutions': [{
|
||||
'name': 'somename',
|
||||
'url': 'https://fake.com'
|
||||
}],
|
||||
'revisions': [],
|
||||
'first_sln': 'somename',
|
||||
'target_os': None,
|
||||
'target_os_only': None,
|
||||
'patch_root': None,
|
||||
'issue': None,
|
||||
'patchset': None,
|
||||
'patch_url': None,
|
||||
'rietveld_server': None,
|
||||
'gerrit_ref': None,
|
||||
'gerrit_repo': None,
|
||||
'revision_mapping': {},
|
||||
'apply_issue_email_file': None,
|
||||
'apply_issue_key_file': None,
|
||||
'buildspec': False,
|
||||
'gyp_env': None,
|
||||
'shallow': False,
|
||||
'runhooks': False,
|
||||
'refs': [],
|
||||
'git_cache_dir': 'fake_cache_dir'
|
||||
}
|
||||
|
||||
|
||||
class MockedPopen(object):
|
||||
"""A fake instance of a called subprocess.
|
||||
|
||||
This is meant to be used in conjunction with MockedCall.
|
||||
"""
|
||||
def __init__(self, args=None, kwargs=None):
|
||||
self.args = args or []
|
||||
self.kwargs = kwargs or {}
|
||||
self.return_value = None
|
||||
self.fails = False
|
||||
|
||||
def returns(self, rv):
|
||||
"""Set the return value when this popen is called.
|
||||
|
||||
rv can be a string, or a callable (eg function).
|
||||
"""
|
||||
self.return_value = rv
|
||||
return self
|
||||
|
||||
def check(self, args, kwargs):
|
||||
"""Check to see if the given args/kwargs call match this instance.
|
||||
|
||||
This does a partial match, so that a call to "git clone foo" will match
|
||||
this instance if this instance was recorded as "git clone"
|
||||
"""
|
||||
if any(input_arg != expected_arg
|
||||
for (input_arg, expected_arg) in zip(args, self.args)):
|
||||
return False
|
||||
return self.return_value
|
||||
|
||||
def __call__(self, args, kwargs):
|
||||
"""Actually call this popen instance."""
|
||||
if hasattr(self.return_value, '__call__'):
|
||||
return self.return_value(*args, **kwargs)
|
||||
return self.return_value
|
||||
|
||||
|
||||
class MockedCall(object):
|
||||
"""A fake instance of bot_update.call().
|
||||
|
||||
This object is pre-seeded with "answers" in self.expectations. The type
|
||||
is a MockedPopen object, or any object with a __call__() and check() method.
|
||||
The check() method is used to check to see if the correct popen object is
|
||||
chosen (can be a partial match, eg a "git clone" popen module would match
|
||||
a "git clone foo" call).
|
||||
By default, if no answers have been pre-seeded, the call() returns successful
|
||||
with an empty string.
|
||||
"""
|
||||
def __init__(self, fake_filesystem):
|
||||
self.expectations = []
|
||||
self.records = []
|
||||
|
||||
def expect(self, args=None, kwargs=None):
|
||||
args = args or []
|
||||
kwargs = kwargs or {}
|
||||
popen = MockedPopen(args, kwargs)
|
||||
self.expectations.append(popen)
|
||||
return popen
|
||||
|
||||
def __call__(self, *args, **kwargs):
|
||||
self.records.append((args, kwargs))
|
||||
for popen in self.expectations:
|
||||
if popen.check(args, kwargs):
|
||||
self.expectations.remove(popen)
|
||||
return popen(args, kwargs)
|
||||
return ''
|
||||
|
||||
|
||||
class MockedGclientSync():
|
||||
"""A class producing a callable instance of gclient sync.
|
||||
|
||||
Because for bot_update, gclient sync also emits an output json file, we need
|
||||
a callable object that can understand where the output json file is going, and
|
||||
emit a (albite) fake file for bot_update to consume.
|
||||
"""
|
||||
def __init__(self, fake_filesystem):
|
||||
self.output = {}
|
||||
self.fake_filesystem = fake_filesystem
|
||||
|
||||
def __call__(self, *args, **_):
|
||||
output_json_index = args.index('--output-json') + 1
|
||||
with self.fake_filesystem.open(args[output_json_index], 'w') as f:
|
||||
json.dump(self.output, f)
|
||||
|
||||
|
||||
class FakeFile():
|
||||
def __init__(self):
|
||||
self.contents = ''
|
||||
|
||||
def write(self, buf):
|
||||
self.contents += buf
|
||||
|
||||
def read(self):
|
||||
return self.contents
|
||||
|
||||
def __enter__(self):
|
||||
return self
|
||||
|
||||
def __exit__(self, _, __, ___):
|
||||
pass
|
||||
|
||||
|
||||
class FakeFilesystem():
|
||||
def __init__(self):
|
||||
self.files = {}
|
||||
|
||||
def open(self, target, mode='r', encoding=None):
|
||||
if 'w' in mode:
|
||||
self.files[target] = FakeFile()
|
||||
return self.files[target]
|
||||
return self.files[target]
|
||||
|
||||
|
||||
def fake_git(*args, **kwargs):
|
||||
return bot_update.call('git', *args, **kwargs)
|
||||
|
||||
|
||||
class EnsureCheckoutUnittests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.filesystem = FakeFilesystem()
|
||||
self.call = MockedCall(self.filesystem)
|
||||
self.gclient = MockedGclientSync(self.filesystem)
|
||||
self.call.expect(('gclient', 'sync')).returns(self.gclient)
|
||||
self.old_call = getattr(bot_update, 'call')
|
||||
self.params = copy.deepcopy(DEFAULT_PARAMS)
|
||||
setattr(bot_update, 'call', self.call)
|
||||
setattr(bot_update, 'git', fake_git)
|
||||
|
||||
self.old_os_cwd = os.getcwd
|
||||
setattr(os, 'getcwd', lambda: '/b/build/slave/foo/build')
|
||||
|
||||
setattr(bot_update, 'open', self.filesystem.open)
|
||||
self.old_codecs_open = codecs.open
|
||||
setattr(codecs, 'open', self.filesystem.open)
|
||||
|
||||
def tearDown(self):
|
||||
setattr(bot_update, 'call', self.old_call)
|
||||
setattr(os, 'getcwd', self.old_os_cwd)
|
||||
delattr(bot_update, 'open')
|
||||
setattr(codecs, 'open', self.old_codecs_open)
|
||||
|
||||
def testBasic(self):
|
||||
bot_update.ensure_checkout(**self.params)
|
||||
return self.call.records
|
||||
|
||||
def testBasicBuildspec(self):
|
||||
self.params['buildspec'] = bot_update.BUILDSPEC_TYPE(
|
||||
container='branches',
|
||||
version='1.1.1.1'
|
||||
)
|
||||
bot_update.ensure_checkout(**self.params)
|
||||
return self.call.records
|
||||
|
||||
def testBasicShallow(self):
|
||||
self.params['shallow'] = True
|
||||
bot_update.ensure_checkout(**self.params)
|
||||
return self.call.records
|
||||
|
||||
def testBasicSVNPatch(self):
|
||||
self.params['patch_url'] = 'svn://server.com/patch.diff'
|
||||
self.params['patch_root'] = 'somename'
|
||||
bot_update.ensure_checkout(**self.params)
|
||||
return self.call.records
|
||||
|
||||
def testBasicRietveldPatch(self):
|
||||
self.params['issue'] = '12345'
|
||||
self.params['patchset'] = '1'
|
||||
self.params['rietveld_server'] = 'https://rietveld.com'
|
||||
self.params['patch_root'] = 'somename'
|
||||
bot_update.ensure_checkout(**self.params)
|
||||
return self.call.records
|
||||
|
||||
|
||||
class SolutionsUnittests(unittest.TestCase):
|
||||
def testBasicSVN(self):
|
||||
sln = [{
|
||||
'name': 'src',
|
||||
'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'
|
||||
}, {
|
||||
'name': 'git',
|
||||
'url': 'https://abc.googlesource.com/foo.git'
|
||||
}]
|
||||
git_slns, root, buildspec = bot_update.solutions_to_git(sln)
|
||||
self.assertEquals(root, '/chrome/trunk/src')
|
||||
self.assertEquals(git_slns, [{
|
||||
'deps_file': '.DEPS.git',
|
||||
'managed': False,
|
||||
'name': 'src',
|
||||
'url': 'https://chromium.googlesource.com/chromium/src.git'
|
||||
}, {
|
||||
'url': 'https://abc.googlesource.com/foo.git',
|
||||
'managed': False,
|
||||
'name': 'git'
|
||||
}])
|
||||
self.assertFalse(buildspec)
|
||||
bot_update.solutions_printer(git_slns)
|
||||
|
||||
def testBasicBuildspec(self):
|
||||
sln = [{
|
||||
'name': 'buildspec',
|
||||
'url': ('svn://svn.chromium.org/chrome-internal/'
|
||||
'trunk/tools/buildspec/releases/1234'),
|
||||
}]
|
||||
git_slns, root, buildspec = bot_update.solutions_to_git(sln)
|
||||
self.assertEquals(
|
||||
buildspec,
|
||||
bot_update.BUILDSPEC_TYPE(container='releases', version='1234'))
|
||||
self.assertEquals(
|
||||
root, '/chrome-internal/trunk/tools/buildspec/releases/1234')
|
||||
self.assertEquals(git_slns[0]['deps_file'], 'releases/1234/DEPS')
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
Loading…
Reference in New Issue