InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

roll_dep_test: fix tests

Browse Source 
This partially reverts commit 1221440015.

Change-Id: Ib2e9d41b3871004376a952e643e13a7e67eb750e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6340427
Commit-Queue: Yiwei Zhang <yiwzhang@google.com>
Reviewed-by: Yiwei Zhang <yiwzhang@google.com>
Reviewed-by: Allen Li <ayatane@chromium.org>
This commit is contained in:
Josip Sokcevic
2025-03-10 15:57:39 -07:00
committed by LUCI CQ
parent b0d4f7c473
commit f61e11c19f
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
git_auth.py
View File

@@ -119,6 +119,7 @@ class ConfigChanger(object):
mode=ConfigMode.NEW_AUTH,
remote_url=remote_url,
)
assert c._shortname, "Short name is empty"
c.mode = cls._infer_mode(cwd, c._shortname + '-review.googlesource.com')
return c
@@ -303,6 +304,8 @@ def Configure(cwd: str, cl: git_cl.Changelist) -> None:
def ConfigureGlobal(cwd: str, remote_url: str) -> None:
"""Configure global/user Git authentication."""
logging.debug('Configuring global Git authentication for %s', remote_url)
if remote_url.startswith('file://'):
return
ConfigChanger.new_for_remote(cwd, remote_url).apply_global(cwd)

22
tests/roll_dep_test.py
View File

@@ -41,7 +41,7 @@ class FakeRepos(fake_repos.FakeReposBase):
'repo_1', {
'DEPS': '\n'.join([
'deps = {',
' "src/foo": "%(git_base)srepo_2@%(repo_2_revision)s",',
' "src/foo": "file://%(git_base)srepo_2@%(repo_2_revision)s",',
'}',
'hooks = [',
' {"action": ["foo", "--android", "{checkout_android}"]}',
@@ -71,9 +71,11 @@ class RollDepTest(fake_repos.FakeReposTestBase):
self.src_dir = os.path.join(self.root_dir, 'src')
self.foo_dir = os.path.join(self.src_dir, 'foo')
if self.enabled:
self.call(
[GCLIENT, 'config', self.git_base + 'repo_1', '--name', 'src'],
cwd=self.root_dir)
self.call([
GCLIENT, 'config', 'file://' + self.git_base + 'repo_1',
'--name', 'src'
],
cwd=self.root_dir)
self.call([GCLIENT, 'sync'], cwd=self.root_dir)
def call(self, cmd, cwd=None):
@@ -108,8 +110,8 @@ class RollDepTest(fake_repos.FakeReposTestBase):
self.assertEqual(self.gitrevparse(self.foo_dir), expected_revision)
self.assertEqual([
'deps = {',
' "src/foo": "' + self.git_base.replace('\\', '\\\\') + 'repo_2@' +
expected_revision + '",',
' "src/foo": "file://' + self.git_base.replace('\\', '\\\\') +
'repo_2@' + expected_revision + '",',
'}',
'hooks = [',
' {"action": ["foo", "--android", "{checkout_android}"]}',
@@ -157,8 +159,8 @@ class RollDepTest(fake_repos.FakeReposTestBase):
self.assertEqual(self.gitrevparse(self.foo_dir), expected_revision)
self.assertEqual([
'deps = {',
' "src/foo": "' + self.git_base.replace('\\', '\\\\') + 'repo_2@' +
expected_revision + '",',
' "src/foo": "file://' + self.git_base.replace('\\', '\\\\') +
'repo_2@' + expected_revision + '",',
'}',
'hooks = [',
' {"action": ["foo", "--android", "{checkout_android}"]}',
@@ -189,8 +191,8 @@ class RollDepTest(fake_repos.FakeReposTestBase):
self.assertEqual(self.gitrevparse(self.foo_dir), expected_revision)
self.assertEqual([
'deps = {',
' "src/foo": "' + self.git_base.replace('\\', '\\\\') + 'repo_2@' +
expected_revision + '",',
' "src/foo": "file://' + self.git_base.replace('\\', '\\\\') +
'repo_2@' + expected_revision + '",',
'}',
'hooks = [',
' {"action": ["foo", "--android", "{checkout_android}"]}',