Fix roll_dep_test.py

4 tests consistently error with "FileNotFoundError". Ensure that both
DEPS and gclient config use the same "file://" URI format so gclient
recognizes the repo as identical and doesn't move src/ to _bad_scm/.

Bug: 391455129
Change-Id: I507750754adc5e83b8a8ce853013a20f60102096
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6259135
Commit-Queue: Gavin Mak <gavinmak@google.com>
Reviewed-by: Yiwei Zhang <yiwzhang@google.com>
changes/35/6259135/2
Gavin Mak 2 weeks ago committed by LUCI CQ
parent a155deff42
commit 4734cfabf4

@ -41,7 +41,7 @@ class FakeRepos(fake_repos.FakeReposBase):
'repo_1', {
'DEPS': '\n'.join([
'deps = {',
' "src/foo": "file:///%(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,7 +110,7 @@ class RollDepTest(fake_repos.FakeReposTestBase):
self.assertEqual(self.gitrevparse(self.foo_dir), expected_revision)
self.assertEqual([
'deps = {',
' "src/foo": "file:///' + self.git_base.replace('\\', '\\\\') +
' "src/foo": "file://' + self.git_base.replace('\\', '\\\\') +
'repo_2@' + expected_revision + '",',
'}',
'hooks = [',
@ -157,7 +159,7 @@ class RollDepTest(fake_repos.FakeReposTestBase):
self.assertEqual(self.gitrevparse(self.foo_dir), expected_revision)
self.assertEqual([
'deps = {',
' "src/foo": "file:///' + self.git_base.replace('\\', '\\\\') +
' "src/foo": "file://' + self.git_base.replace('\\', '\\\\') +
'repo_2@' + expected_revision + '",',
'}',
'hooks = [',
@ -189,7 +191,7 @@ class RollDepTest(fake_repos.FakeReposTestBase):
self.assertEqual(self.gitrevparse(self.foo_dir), expected_revision)
self.assertEqual([
'deps = {',
' "src/foo": "file:///' + self.git_base.replace('\\', '\\\\') +
' "src/foo": "file://' + self.git_base.replace('\\', '\\\\') +
'repo_2@' + expected_revision + '",',
'}',
'hooks = [',

Loading…
Cancel
Save