Fix infra and infra_internal fetch recipes.
expect_tests and testing_support are now pulled in via DEPS.
R=cmp@chromium.org, pgervais@chromium.org
BUG=
Review URL: https://codereview.chromium.org/901083003
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293963 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/recipes/infra.py b/recipes/infra.py
index 3c65b44..f9698a6 100644
--- a/recipes/infra.py
+++ b/recipes/infra.py
@@ -14,24 +14,18 @@
@staticmethod
def fetch_spec(_props):
- solution = lambda name, path_infix = None: {
- 'name' : name,
- 'url' : 'https://chromium.googlesource.com/infra/%s%s.git' % (
- path_infix + '/' if path_infix else '', name
- ),
- 'deps_file': '.DEPS.git',
- 'managed' : False,
- }
- spec = {
- 'solutions': [
- solution('infra'),
- solution('expect_tests', 'testing'),
- solution('testing_support', 'testing'),
- ],
- }
return {
- 'type': 'gclient_git',
- 'gclient_git_spec': spec,
+ 'type': 'gclient_git',
+ 'gclient_git_spec': {
+ 'solutions': [
+ {
+ 'name' : 'infra',
+ 'url' : 'https://chromium.googlesource.com/infra/infra.git',
+ 'deps_file': '.DEPS.git',
+ 'managed' : False,
+ }
+ ],
+ },
}
@staticmethod
diff --git a/recipes/infra_internal.py b/recipes/infra_internal.py
index 3801e94..ad6afb9 100644
--- a/recipes/infra_internal.py
+++ b/recipes/infra_internal.py
@@ -25,18 +25,6 @@
'deps_file': '.DEPS.git',
'managed': False
},
- {
- 'name': 'testing/expect_tests',
- 'url': url('chromium', 'infra/testing/expect_tests'),
- 'deps_file': '.DEPS.git',
- 'managed': False
- },
- {
- 'name': 'testing/testing_support',
- 'url': url('chromium', 'infra/testing/testing_support'),
- 'deps_file': '.DEPS.git',
- 'managed': False
- },
],
}
return {