mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Introduce GCS dependencies support in DEPS autoroller

Browse source 
While GCS dependencies aren't currently used, their support is required
to prevent the autoroller from breaking when encountering GCS dep types.

Bug: None
Change-Id: I58601e9eaeb8372058da4d4ee02cd2ca589e02c7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/349740
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42222}
This commit is contained in:
Byoungchan Lee 2024-05-03 19:39:55 +09:00 committed by WebRTC LUCI CQ
parent 605d00bd6f
commit b1a71aa7c3
4 changed files with 315 additions and 245 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools_webrtc/autoroller/roll_deps.py
View file

@ -90,6 +90,7 @@ DepsEntry = collections.namedtuple('DepsEntry', 'path url revision')
ChangedDep = collections.namedtuple('ChangedDep', ChangedDep = collections.namedtuple('ChangedDep',
'path url current_rev new_rev') 'path url current_rev new_rev')
CipdDepsEntry = collections.namedtuple('CipdDepsEntry', 'path packages') CipdDepsEntry = collections.namedtuple('CipdDepsEntry', 'path packages')
GcsDepsEntry = collections.namedtuple('GcsDepsEntry', 'path bucket objects')
VersionEntry = collections.namedtuple('VersionEntry', 'version') VersionEntry = collections.namedtuple('VersionEntry', 'version')
ChangedCipdPackage = collections.namedtuple( ChangedCipdPackage = collections.namedtuple(
'ChangedCipdPackage', 'path package current_version new_version') 'ChangedCipdPackage', 'path package current_version new_version')
@ -279,6 +280,9 @@ def BuildDepsentryDict(deps_dict):
dep = {'url': dep} dep = {'url': dep}
if dep.get('dep_type') == 'cipd': if dep.get('dep_type') == 'cipd':
result[path] = CipdDepsEntry(path, dep['packages']) result[path] = CipdDepsEntry(path, dep['packages'])
elif dep.get('dep_type') == 'gcs':
result[path] = GcsDepsEntry(path, dep['bucket'],
dep['objects'])
else: else:
if '@' not in dep['url']: if '@' not in dep['url']:
url, revision = dep['url'], 'HEAD' url, revision = dep['url'], 'HEAD'
@ -441,6 +445,15 @@ def CalculateChangedDeps(webrtc_deps, new_cr_deps):
cr_deps_entry.packages)) cr_deps_entry.packages))
continue continue
if isinstance(cr_deps_entry, GcsDepsEntry):
result.extend(
_FindChangedVars(
path, ','.join(x['object_name']
for x in webrtc_deps_entry.objects),
','.join(x['object_name']
for x in cr_deps_entry.objects)))
continue
if isinstance(cr_deps_entry, VersionEntry): if isinstance(cr_deps_entry, VersionEntry):
result.extend( result.extend(
_FindChangedVars(path, webrtc_deps_entry.version, _FindChangedVars(path, webrtc_deps_entry.version,

519
tools_webrtc/autoroller/unittests/roll_deps_test.py
View file

@ -8,6 +8,7 @@
# in the file PATENTS. All contributing project authors may # in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
# pylint: disable=invalid-name
import glob import glob
import os import os
@ -49,323 +50,351 @@ NO_CHROMIUM_REVISION_UPDATE = ChromiumRevisionUpdate('cafe', 'cafe')
class TestError(Exception): class TestError(Exception):
pass pass
class FakeCmd: class FakeCmd:
def __init__(self):
self.expectations = []
def AddExpectation(self, *args, **kwargs): def __init__(self):
returns = kwargs.pop('_returns', None) self.expectations = []
ignores = kwargs.pop('_ignores', [])
self.expectations.append((args, kwargs, returns, ignores))
def __call__(self, *args, **kwargs): def AddExpectation(self, *args, **kwargs):
if not self.expectations: returns = kwargs.pop('_returns', None)
raise TestError('Got unexpected\n%s\n%s' % (args, kwargs)) ignores = kwargs.pop('_ignores', [])
exp_args, exp_kwargs, exp_returns, ignores = self.expectations.pop(0) self.expectations.append((args, kwargs, returns, ignores))
for item in ignores:
kwargs.pop(item, None) def __call__(self, *args, **kwargs):
if args != exp_args or kwargs != exp_kwargs: if not self.expectations:
message = 'Expected:\n args: %s\n kwargs: %s\n' % (exp_args, exp_kwargs) raise TestError('Got unexpected\n%s\n%s' % (args, kwargs))
message += 'Got:\n args: %s\n kwargs: %s\n' % (args, kwargs) exp_args, exp_kwargs, exp_returns, ignores = self.expectations.pop(0)
raise TestError(message) for item in ignores:
return exp_returns kwargs.pop(item, None)
if args != exp_args or kwargs != exp_kwargs:
message = ('Expected:\n args: %s\n kwargs: %s\n' %
(exp_args, exp_kwargs))
message += 'Got:\n args: %s\n kwargs: %s\n' % (args, kwargs)
raise TestError(message)
return exp_returns
class NullCmd: class NullCmd:
"""No-op mock when calls mustn't be checked. """ """No-op mock when calls mustn't be checked. """
def __call__(self, *args, **kwargs): def __call__(self, *args, **kwargs):
# Empty stdout and stderr. # Empty stdout and stderr.
return None, None return None, None
class TestRollChromiumRevision(unittest.TestCase): class TestRollChromiumRevision(unittest.TestCase):
def setUp(self):
self._output_dir = tempfile.mkdtemp()
test_data_dir = os.path.join(SCRIPT_DIR, 'testdata', 'roll_deps')
for test_file in glob.glob(os.path.join(test_data_dir, '*')):
shutil.copy(test_file, self._output_dir)
join = lambda f: os.path.join(self._output_dir, f)
self._webrtc_depsfile = join('DEPS')
self._new_cr_depsfile = join('DEPS.chromium.new')
self._webrtc_depsfile_android = join('DEPS.with_android_deps')
self._new_cr_depsfile_android = join('DEPS.chromium.with_android_deps')
self.fake = FakeCmd()
def tearDown(self): def setUp(self):
shutil.rmtree(self._output_dir, ignore_errors=True) self._output_dir = tempfile.mkdtemp()
self.assertEqual(self.fake.expectations, []) test_data_dir = os.path.join(SCRIPT_DIR, 'testdata', 'roll_deps')
for test_file in glob.glob(os.path.join(test_data_dir, '*')):
shutil.copy(test_file, self._output_dir)
join = lambda f: os.path.join(self._output_dir, f)
self._webrtc_depsfile = join('DEPS')
self._new_cr_depsfile = join('DEPS.chromium.new')
self._webrtc_depsfile_android = join('DEPS.with_android_deps')
self._new_cr_depsfile_android = join('DEPS.chromium.with_android_deps')
self.fake = FakeCmd()
def testVarLookup(self): def tearDown(self):
local_scope = {'foo': 'wrong', 'vars': {'foo': 'bar'}} shutil.rmtree(self._output_dir, ignore_errors=True)
lookup = roll_deps.VarLookup(local_scope) self.assertEqual(self.fake.expectations, [])
self.assertEqual(lookup('foo'), 'bar')
def testUpdateDepsFile(self): def testVarLookup(self):
new_rev = 'aaaaabbbbbcccccdddddeeeeefffff0000011111' local_scope = {'foo': 'wrong', 'vars': {'foo': 'bar'}}
current_rev = TEST_DATA_VARS['chromium_revision'] lookup = roll_deps.VarLookup(local_scope)
self.assertEqual(lookup('foo'), 'bar')
with open(self._new_cr_depsfile_android, 'rb') as deps_file: def testUpdateDepsFile(self):
new_cr_contents = deps_file.read().decode('utf-8') new_rev = 'aaaaabbbbbcccccdddddeeeeefffff0000011111'
current_rev = TEST_DATA_VARS['chromium_revision']
UpdateDepsFile(self._webrtc_depsfile, with open(self._new_cr_depsfile_android, 'rb') as deps_file:
ChromiumRevisionUpdate(current_rev, new_rev), [], new_cr_contents = deps_file.read().decode('utf-8')
new_cr_contents)
with open(self._webrtc_depsfile, 'rb') as deps_file:
deps_contents = deps_file.read().decode('utf-8')
self.assertTrue(new_rev in deps_contents,
'Failed to find %s in\n%s' % (new_rev, deps_contents))
def _UpdateDepsSetup(self): UpdateDepsFile(self._webrtc_depsfile,
with open(self._webrtc_depsfile_android, 'rb') as deps_file: ChromiumRevisionUpdate(current_rev, new_rev), [],
webrtc_contents = deps_file.read().decode('utf-8') new_cr_contents)
with open(self._new_cr_depsfile_android, 'rb') as deps_file: with open(self._webrtc_depsfile, 'rb') as deps_file:
new_cr_contents = deps_file.read().decode('utf-8') deps_contents = deps_file.read().decode('utf-8')
webrtc_deps = ParseDepsDict(webrtc_contents) self.assertTrue(
new_cr_deps = ParseDepsDict(new_cr_contents) new_rev in deps_contents,
'Failed to find %s in\n%s' % (new_rev, deps_contents))
changed_deps = CalculateChangedDeps(webrtc_deps, new_cr_deps) def _UpdateDepsSetup(self):
with mock.patch('roll_deps._RunCommand', NullCmd()): with open(self._webrtc_depsfile_android, 'rb') as deps_file:
UpdateDepsFile(self._webrtc_depsfile_android, NO_CHROMIUM_REVISION_UPDATE, webrtc_contents = deps_file.read().decode('utf-8')
changed_deps, new_cr_contents) with open(self._new_cr_depsfile_android, 'rb') as deps_file:
new_cr_contents = deps_file.read().decode('utf-8')
webrtc_deps = ParseDepsDict(webrtc_contents)
new_cr_deps = ParseDepsDict(new_cr_contents)
with open(self._webrtc_depsfile_android, 'rb') as deps_file: changed_deps = CalculateChangedDeps(webrtc_deps, new_cr_deps)
updated_contents = deps_file.read().decode('utf-8') with mock.patch('roll_deps._RunCommand', NullCmd()):
UpdateDepsFile(self._webrtc_depsfile_android,
NO_CHROMIUM_REVISION_UPDATE, changed_deps,
new_cr_contents)
return webrtc_contents, updated_contents with open(self._webrtc_depsfile_android, 'rb') as deps_file:
updated_contents = deps_file.read().decode('utf-8')
def testUpdateAndroidGeneratedDeps(self): return webrtc_contents, updated_contents
_, updated_contents = self._UpdateDepsSetup()
changed = 'third_party/android_deps/libs/android_arch_core_common' def testUpdateAndroidGeneratedDeps(self):
changed_version = '1.0.0-cr0' _, updated_contents = self._UpdateDepsSetup()
self.assertTrue(changed in updated_contents)
self.assertTrue(changed_version in updated_contents)
def testAddAndroidGeneratedDeps(self): changed = 'third_party/android_deps/libs/android_arch_core_common'
webrtc_contents, updated_contents = self._UpdateDepsSetup() changed_version = '1.0.0-cr0'
self.assertTrue(changed in updated_contents)
self.assertTrue(changed_version in updated_contents)
added = 'third_party/android_deps/libs/android_arch_lifecycle_common' def testAddAndroidGeneratedDeps(self):
self.assertFalse(added in webrtc_contents) webrtc_contents, updated_contents = self._UpdateDepsSetup()
self.assertTrue(added in updated_contents)
def testRemoveAndroidGeneratedDeps(self): added = 'third_party/android_deps/libs/android_arch_lifecycle_common'
webrtc_contents, updated_contents = self._UpdateDepsSetup() self.assertFalse(added in webrtc_contents)
self.assertTrue(added in updated_contents)
removed = 'third_party/android_deps/libs/android_arch_lifecycle_runtime' def testRemoveAndroidGeneratedDeps(self):
self.assertTrue(removed in webrtc_contents) webrtc_contents, updated_contents = self._UpdateDepsSetup()
self.assertFalse(removed in updated_contents)
def testParseDepsDict(self): # pylint: disable=line-too-long
with open(self._webrtc_depsfile, 'rb') as deps_file: removed = 'third_party/android_deps/libs/android_arch_lifecycle_runtime'
deps_contents = deps_file.read().decode('utf-8') self.assertTrue(removed in webrtc_contents)
local_scope = ParseDepsDict(deps_contents) self.assertFalse(removed in updated_contents)
vars_dict = local_scope['vars']
def AssertVar(variable_name): def testParseDepsDict(self):
self.assertEqual(vars_dict[variable_name], TEST_DATA_VARS[variable_name]) with open(self._webrtc_depsfile, 'rb') as deps_file:
deps_contents = deps_file.read().decode('utf-8')
local_scope = ParseDepsDict(deps_contents)
vars_dict = local_scope['vars']
AssertVar('chromium_git') def AssertVar(variable_name):
AssertVar('chromium_revision') self.assertEqual(vars_dict[variable_name],
self.assertEqual(len(local_scope['deps']), 3) TEST_DATA_VARS[variable_name])
self.assertEqual(len(local_scope['deps_os']), 1)
def testGetMatchingDepsEntriesReturnsPathInSimpleCase(self): AssertVar('chromium_git')
entries = GetMatchingDepsEntries(DEPS_ENTRIES, 'src/testing/gtest') AssertVar('chromium_revision')
self.assertEqual(len(entries), 1) self.assertEqual(len(local_scope['deps']), 4)
self.assertEqual(entries[0], DEPS_ENTRIES['src/testing/gtest']) self.assertEqual(len(local_scope['deps_os']), 1)
def testGetMatchingDepsEntriesHandlesSimilarStartingPaths(self): def testGetMatchingDepsEntriesReturnsPathInSimpleCase(self):
entries = GetMatchingDepsEntries(DEPS_ENTRIES, 'src/testing') entries = GetMatchingDepsEntries(DEPS_ENTRIES, 'src/testing/gtest')
self.assertEqual(len(entries), 2) self.assertEqual(len(entries), 1)
self.assertEqual(entries[0], DEPS_ENTRIES['src/testing/gtest'])
def testGetMatchingDepsEntriesHandlesTwoPathsWithIdenticalFirstParts(self): def testGetMatchingDepsEntriesHandlesSimilarStartingPaths(self):
entries = GetMatchingDepsEntries(DEPS_ENTRIES, 'src/build') entries = GetMatchingDepsEntries(DEPS_ENTRIES, 'src/testing')
self.assertEqual(len(entries), 1) self.assertEqual(len(entries), 2)
def testCalculateChangedDeps(self): def testGetMatchingDepsEntriesHandlesTwoPathsWithIdenticalFirstParts(self):
webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile) entries = GetMatchingDepsEntries(DEPS_ENTRIES, 'src/build')
new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile) self.assertEqual(len(entries), 1)
with mock.patch('roll_deps._RunCommand', self.fake):
_SetupGitLsRemoteCall(
self.fake, 'https://chromium.googlesource.com/chromium/src/build',
BUILD_NEW_REV)
changed_deps = CalculateChangedDeps(webrtc_deps, new_cr_deps)
self.assertEqual(len(changed_deps), 4) def testCalculateChangedDeps(self):
self.assertEqual(changed_deps[0].path, 'fuchsia') webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile)
self.assertEqual(changed_deps[0].current_version, 'version:10.20221201.3.1') new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile)
self.assertEqual(changed_deps[0].new_version, 'version:11.20230207.1.1') with mock.patch('roll_deps._RunCommand', self.fake):
_SetupGitLsRemoteCall(
self.fake,
'https://chromium.googlesource.com/chromium/src/build',
BUILD_NEW_REV)
changed_deps = CalculateChangedDeps(webrtc_deps, new_cr_deps)
self.assertEqual(changed_deps[1].path, 'src/build') self.assertEqual(len(changed_deps), 5)
self.assertEqual(changed_deps[1].current_rev, BUILD_OLD_REV) self.assertEqual(changed_deps[0].path, 'fuchsia')
self.assertEqual(changed_deps[1].new_rev, BUILD_NEW_REV) self.assertEqual(changed_deps[0].current_version,
'version:10.20221201.3.1')
self.assertEqual(changed_deps[0].new_version,
'version:11.20230207.1.1')
self.assertEqual(changed_deps[2].path, 'src/buildtools/linux64') self.assertEqual(changed_deps[1].path, 'src/build')
self.assertEqual(changed_deps[2].package, 'gn/gn/linux-amd64') self.assertEqual(changed_deps[1].current_rev, BUILD_OLD_REV)
self.assertEqual(changed_deps[2].current_version, self.assertEqual(changed_deps[1].new_rev, BUILD_NEW_REV)
'git_revision:69ec4fca1fa69ddadae13f9e6b7507efa0675263')
self.assertEqual(changed_deps[2].new_version, 'git_revision:new-revision')
self.assertEqual(changed_deps[3].path, 'src/third_party/depot_tools') self.assertEqual(changed_deps[2].path, 'src/buildtools/linux64')
self.assertEqual(changed_deps[3].current_rev, DEPOTTOOLS_OLD_REV) self.assertEqual(changed_deps[2].package, 'gn/gn/linux-amd64')
self.assertEqual(changed_deps[3].new_rev, DEPOTTOOLS_NEW_REV) self.assertEqual(
changed_deps[2].current_version,
'git_revision:69ec4fca1fa69ddadae13f9e6b7507efa0675263')
self.assertEqual(changed_deps[2].new_version,
'git_revision:new-revision')
def testWithDistinctDeps(self): self.assertEqual(changed_deps[3].path, 'src/third_party/depot_tools')
"""Check CalculateChangedDeps works when deps are added/removed.""" self.assertEqual(changed_deps[3].current_rev, DEPOTTOOLS_OLD_REV)
webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile_android) self.assertEqual(changed_deps[3].new_rev, DEPOTTOOLS_NEW_REV)
new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile_android)
changed_deps = CalculateChangedDeps(webrtc_deps, new_cr_deps)
self.assertEqual(len(changed_deps), 1)
self.assertEqual(
changed_deps[0].path,
'src/third_party/android_deps/libs/android_arch_core_common')
self.assertEqual(
changed_deps[0].package,
'chromium/third_party/android_deps/libs/android_arch_core_common')
self.assertEqual(changed_deps[0].current_version, 'version:0.9.0')
self.assertEqual(changed_deps[0].new_version, 'version:1.0.0-cr0')
def testFindAddedDeps(self): self.assertEqual(changed_deps[4].path,
webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile_android) 'src/third_party/js_code_coverage')
new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile_android) self.assertEqual(
added_android_paths, other_paths = FindAddedDeps(webrtc_deps, new_cr_deps) changed_deps[4].current_version,
self.assertEqual( 'js_code_coverage/d538975c93eefc7bafd599b50f867e90c1ef17f3')
added_android_paths, self.assertEqual(
['src/third_party/android_deps/libs/android_arch_lifecycle_common']) changed_deps[4].new_version,
self.assertEqual(other_paths, []) 'js_code_coverage/d538975c93eefc7bafd599b50f867e90c1ef17f4')
def testFindRemovedDeps(self): def testWithDistinctDeps(self):
webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile_android) """Check CalculateChangedDeps works when deps are added/removed."""
new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile_android) webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile_android)
removed_android_paths, other_paths = FindRemovedDeps( new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile_android)
webrtc_deps, new_cr_deps) changed_deps = CalculateChangedDeps(webrtc_deps, new_cr_deps)
self.assertEqual( self.assertEqual(len(changed_deps), 1)
removed_android_paths, self.assertEqual(
['src/third_party/android_deps/libs/android_arch_lifecycle_runtime']) changed_deps[0].path,
self.assertEqual(other_paths, []) 'src/third_party/android_deps/libs/android_arch_core_common')
self.assertEqual(
changed_deps[0].package,
'chromium/third_party/android_deps/libs/android_arch_core_common')
self.assertEqual(changed_deps[0].current_version, 'version:0.9.0')
self.assertEqual(changed_deps[0].new_version, 'version:1.0.0-cr0')
def testMissingDepsIsDetected(self): def testFindAddedDeps(self):
"""Check error is reported when deps cannot be automatically removed.""" webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile_android)
# The situation at test is the following: new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile_android)
# * A WebRTC DEPS entry is missing from Chromium. added_android_paths, other_paths = FindAddedDeps(
# * The dependency isn't an android_deps (those are supported). webrtc_deps, new_cr_deps)
webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile) self.assertEqual(added_android_paths, [
new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile_android) 'src/third_party/android_deps/libs/android_arch_lifecycle_common'
_, other_paths = FindRemovedDeps(webrtc_deps, new_cr_deps) ])
self.assertEqual( self.assertEqual(other_paths, [])
other_paths,
['fuchsia', 'src/buildtools/linux64', 'src/third_party/depot_tools'])
def testExpectedDepsIsNotReportedMissing(self): def testFindRemovedDeps(self):
"""Some deps musn't be seen as missing, even if absent from Chromium.""" webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile_android)
webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile) new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile_android)
new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile_android) removed_android_paths, other_paths = FindRemovedDeps(
removed_android_paths, other_paths = FindRemovedDeps( webrtc_deps, new_cr_deps)
webrtc_deps, new_cr_deps) self.assertEqual(removed_android_paths, [
self.assertTrue('src/build' not in removed_android_paths) 'src/third_party/android_deps/libs/android_arch_lifecycle_runtime'
self.assertTrue('src/build' not in other_paths) ])
self.assertEqual(other_paths, [])
def _CommitMessageSetup(self): def testMissingDepsIsDetected(self):
webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile_android) """Check error is reported when deps cannot be automatically removed.
new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile_android) """
# The situation at test is the following:
# * A WebRTC DEPS entry is missing from Chromium.
# * The dependency isn't an android_deps (those are supported).
webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile)
new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile_android)
_, other_paths = FindRemovedDeps(webrtc_deps, new_cr_deps)
self.assertEqual(other_paths, [
'fuchsia', 'src/buildtools/linux64', 'src/third_party/depot_tools',
'src/third_party/js_code_coverage'
])
changed_deps = CalculateChangedDeps(webrtc_deps, new_cr_deps) def testExpectedDepsIsNotReportedMissing(self):
added_paths, _ = FindAddedDeps(webrtc_deps, new_cr_deps) """Some deps musn't be seen as missing, even if absent from Chromium.
removed_paths, _ = FindRemovedDeps(webrtc_deps, new_cr_deps) """
webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile)
new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile_android)
removed_android_paths, other_paths = FindRemovedDeps(
webrtc_deps, new_cr_deps)
self.assertTrue('src/build' not in removed_android_paths)
self.assertTrue('src/build' not in other_paths)
current_commit_pos = 'cafe' def _CommitMessageSetup(self):
new_commit_pos = 'f00d' webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile_android)
new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile_android)
commit_msg = GenerateCommitMessage(NO_CHROMIUM_REVISION_UPDATE, changed_deps = CalculateChangedDeps(webrtc_deps, new_cr_deps)
current_commit_pos, new_commit_pos, added_paths, _ = FindAddedDeps(webrtc_deps, new_cr_deps)
changed_deps, added_paths, removed_paths) removed_paths, _ = FindRemovedDeps(webrtc_deps, new_cr_deps)
return [l.strip() for l in commit_msg.split('\n')] current_commit_pos = 'cafe'
new_commit_pos = 'f00d'
def testChangedDepsInCommitMessage(self): commit_msg = GenerateCommitMessage(NO_CHROMIUM_REVISION_UPDATE,
commit_lines = self._CommitMessageSetup() current_commit_pos, new_commit_pos,
changed_deps, added_paths,
removed_paths)
changed = '* src/third_party/android_deps/libs/' \ return [l.strip() for l in commit_msg.split('\n')]
'android_arch_core_common: version:0.9.0..version:1.0.0-cr0'
self.assertTrue(changed in commit_lines)
# Check it is in adequate section.
changed_line = commit_lines.index(changed)
self.assertTrue('Changed' in commit_lines[changed_line - 1])
def testAddedDepsInCommitMessage(self): def testChangedDepsInCommitMessage(self):
commit_lines = self._CommitMessageSetup() commit_lines = self._CommitMessageSetup()
added = '* src/third_party/android_deps/libs/' \ changed = '* src/third_party/android_deps/libs/' \
'android_arch_lifecycle_common' 'android_arch_core_common: version:0.9.0..version:1.0.0-cr0'
self.assertTrue(added in commit_lines) self.assertTrue(changed in commit_lines)
# Check it is in adequate section. # Check it is in adequate section.
added_line = commit_lines.index(added) changed_line = commit_lines.index(changed)
self.assertTrue('Added' in commit_lines[added_line - 1]) self.assertTrue('Changed' in commit_lines[changed_line - 1])
def testRemovedDepsInCommitMessage(self): def testAddedDepsInCommitMessage(self):
commit_lines = self._CommitMessageSetup() commit_lines = self._CommitMessageSetup()
removed = '* src/third_party/android_deps/libs/' \ added = '* src/third_party/android_deps/libs/' \
'android_arch_lifecycle_runtime' 'android_arch_lifecycle_common'
self.assertTrue(removed in commit_lines) self.assertTrue(added in commit_lines)
# Check it is in adequate section. # Check it is in adequate section.
removed_line = commit_lines.index(removed) added_line = commit_lines.index(added)
self.assertTrue('Removed' in commit_lines[removed_line - 1]) self.assertTrue('Added' in commit_lines[added_line - 1])
def testRemovedDepsInCommitMessage(self):
commit_lines = self._CommitMessageSetup()
removed = '* src/third_party/android_deps/libs/' \
'android_arch_lifecycle_runtime'
self.assertTrue(removed in commit_lines)
# Check it is in adequate section.
removed_line = commit_lines.index(removed)
self.assertTrue('Removed' in commit_lines[removed_line - 1])
class TestChooseCQMode(unittest.TestCase): class TestChooseCQMode(unittest.TestCase):
def testSkip(self):
self.assertEqual(ChooseCQMode(True, 99, 500000, 500100), 0)
def testDryRun(self): def testSkip(self):
self.assertEqual(ChooseCQMode(False, 101, 500000, 500100), 1) self.assertEqual(ChooseCQMode(True, 99, 500000, 500100), 0)
def testSubmit(self): def testDryRun(self):
self.assertEqual(ChooseCQMode(False, 100, 500000, 500100), 2) self.assertEqual(ChooseCQMode(False, 101, 500000, 500100), 1)
def testSubmit(self):
self.assertEqual(ChooseCQMode(False, 100, 500000, 500100), 2)
class TestReadUrlContent(unittest.TestCase): class TestReadUrlContent(unittest.TestCase):
def setUp(self):
self.url = 'http://localhost+?format=TEXT'
def testReadUrlContent(self): def setUp(self):
url_mock = mock.Mock() self.url = 'http://localhost+?format=TEXT'
roll_deps.urllib.request.urlopen = url_mock
roll_deps.ReadUrlContent(self.url) def testReadUrlContent(self):
url_mock = mock.Mock()
roll_deps.urllib.request.urlopen = url_mock
calls = [ roll_deps.ReadUrlContent(self.url)
mock.call('http://localhost+?format=TEXT'),
mock.call().readlines(),
mock.call().close()
]
self.assertEqual(url_mock.mock_calls, calls)
def testReadUrlContentError(self): calls = [
roll_deps.logging = mock.Mock() mock.call('http://localhost+?format=TEXT'),
mock.call().readlines(),
mock.call().close()
]
self.assertEqual(url_mock.mock_calls, calls)
readlines_mock = mock.Mock() def testReadUrlContentError(self):
readlines_mock.readlines = mock.Mock( roll_deps.logging = mock.Mock()
side_effect=IOError('Connection error'))
readlines_mock.close = mock.Mock()
url_mock = mock.Mock(return_value=readlines_mock) readlines_mock = mock.Mock()
roll_deps.urllib.request.urlopen = url_mock readlines_mock.readlines = mock.Mock(
side_effect=IOError('Connection error'))
readlines_mock.close = mock.Mock()
try: url_mock = mock.Mock(return_value=readlines_mock)
roll_deps.ReadUrlContent(self.url) roll_deps.urllib.request.urlopen = url_mock
except OSError:
self.assertTrue(roll_deps.logging.exception.called) try:
roll_deps.ReadUrlContent(self.url)
except OSError:
self.assertTrue(roll_deps.logging.exception.called)
def _SetupGitLsRemoteCall(cmd_fake, url, revision): def _SetupGitLsRemoteCall(cmd_fake, url, revision):
cmd = ['git', 'ls-remote', url, revision] cmd = ['git', 'ls-remote', url, revision]
cmd_fake.AddExpectation(cmd, _returns=(revision, None)) cmd_fake.AddExpectation(cmd, _returns=(revision, None))
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

14
tools_webrtc/autoroller/unittests/testdata/roll_deps/DEPS vendored
View file

@ -30,6 +30,20 @@ deps = {
# Script expects to find these markers. # Script expects to find these markers.
# === ANDROID_DEPS Generated Code Start === # === ANDROID_DEPS Generated Code Start ===
# === ANDROID_DEPS Generated Code End === # === ANDROID_DEPS Generated Code End ===
# Entry that uses GCS
'src/third_party/js_code_coverage': {
'dep_type': 'gcs',
'bucket': 'chromium-nodejs',
'objects': [
{
'object_name': 'js_code_coverage/d538975c93eefc7bafd599b50f867e90c1ef17f3',
'sha256sum': '646bb00ced0a930b2eb1e4dbcfac18ebbb8f889bb80599e0254d9d6505427914',
'size_bytes': 1469185,
'generation': 1657780123604338,
},
],
},
} }
deps_os = { deps_os = {

14
tools_webrtc/autoroller/unittests/testdata/roll_deps/DEPS.chromium.new vendored
View file

@ -26,4 +26,18 @@ deps = {
# Script expects to find these markers. # Script expects to find these markers.
# === ANDROID_DEPS Generated Code Start === # === ANDROID_DEPS Generated Code Start ===
# === ANDROID_DEPS Generated Code End === # === ANDROID_DEPS Generated Code End ===
# Entry that uses GCS
'src/third_party/js_code_coverage': {
'dep_type': 'gcs',
'bucket': 'chromium-nodejs',
'objects': [
{
'object_name': 'js_code_coverage/d538975c93eefc7bafd599b50f867e90c1ef17f4',
'sha256sum': '646bb00ced0a930b2eb1e4dbcfac18ebbb8f889bb80599e0254d9d6505427915',
'size_bytes': 1469186,
'generation': 1657780123604339,
},
],
},
} }