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

git_auth: Configure both variations of Gerrit hosts

Browse Source 
ChromeOS sometimes uses -review URLs, so we should support both

Bug: 419182970
Change-Id: I9a3836f5544a8422ccda8ded6e9d88d5a10edda2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7173365
Commit-Queue: Allen Li <ayatane@chromium.org>
Reviewed-by: Gavin Mak <gavinmak@google.com>
This commit is contained in:
Allen Li
2025-12-02 16:35:21 -08:00
committed by LUCI CQ
parent a99ce048b9
commit 1acf6d271e
2 changed files with 93 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
tests/git_auth_test.py
View File

@@ -94,8 +94,23 @@ class TestConfigWizard(unittest.TestCase):
'https://chromium.googlesource.com/chromium/tools/depot_tools.git')
self.wizard._configure_sso(parts, scope='global')
want = {
'url.sso://chromium/.insteadof':
['https://chromium.googlesource.com/'],
'url.sso://chromium/.insteadof': [
'https://chromium.googlesource.com/',
'https://chromium-review.googlesource.com/'
],
}
self.assertEqual(self.global_state, want)
def test_configure_review_sso_global(self):
parts = urllib.parse.urlsplit(
'https://chromium-review.googlesource.com/chromium/tools/depot_tools.git'
)
self.wizard._configure_sso(parts, scope='global')
want = {
'url.sso://chromium/.insteadof': [
'https://chromium.googlesource.com/',
'https://chromium-review.googlesource.com/'
],
}
self.assertEqual(self.global_state, want)
@@ -109,13 +124,28 @@ class TestConfigWizard(unittest.TestCase):
}
self.assertEqual(self.global_state, want)
def test_configure_review_oauth_global(self):
parts = urllib.parse.urlsplit(
'https://chromium-review.googlesource.com/chromium/tools/depot_tools.git'
)
self.wizard._configure_oauth(parts, scope='global')
want = {
'credential.https://chromium-review.googlesource.com.helper':
['', 'luci'],
'credential.https://chromium-review.googlesource.com.usehttppath':
['yes'],
}
self.assertEqual(self.global_state, want)
def test_configure_sso_global_oauth_local(self):
parts = urllib.parse.urlsplit(
'https://chromium.googlesource.com/chromium/tools/depot_tools.git')
self.wizard._configure_sso(parts, scope='global')
want = {
'url.sso://chromium/.insteadof':
['https://chromium.googlesource.com/'],
'url.sso://chromium/.insteadof': [
'https://chromium.googlesource.com/',
'https://chromium-review.googlesource.com/'
],
}
self.assertEqual(self.global_state, want)
self.wizard._configure_oauth(parts, scope='local')
@@ -130,7 +160,34 @@ class TestConfigWizard(unittest.TestCase):
os.getcwd(),
'url.https://chromium.googlesource.com/chromium/tools/depot_tools.git.insteadof'
), [
'https://chromium.googlesource.com/chromium/tools/depot_tools.git'
'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
])
def test_configure_review_sso_global_oauth_local(self):
parts = urllib.parse.urlsplit(
'https://chromium-review.googlesource.com/chromium/tools/depot_tools.git'
)
self.wizard._configure_sso(parts, scope='global')
want = {
'url.sso://chromium/.insteadof': [
'https://chromium.googlesource.com/',
'https://chromium-review.googlesource.com/'
],
}
self.assertEqual(self.global_state, want)
self.wizard._configure_oauth(parts, scope='local')
self.assertEqual(
scm.GIT.GetConfigList(
os.getcwd(),
'credential.https://chromium-review.googlesource.com.helper'),
['', 'luci'])
# Ensure that we're overriding the global overwrite rule
self.assertEqual(
scm.GIT.GetConfigList(
os.getcwd(),
'url.https://chromium-review.googlesource.com/chromium/tools/depot_tools.git.insteadof'
), [
'https://chromium-review.googlesource.com/chromium/tools/depot_tools.git',
])
def test_check_gitcookies_same(self):