diff --git a/recipes/infra.py b/recipes/infra.py index 3c65b4420..f9698a6d1 100644 --- a/recipes/infra.py +++ b/recipes/infra.py @@ -14,24 +14,18 @@ class Infra(recipe_util.Recipe): @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 = { + return { + 'type': 'gclient_git', + 'gclient_git_spec': { 'solutions': [ - solution('infra'), - solution('expect_tests', 'testing'), - solution('testing_support', 'testing'), + { + 'name' : 'infra', + 'url' : 'https://chromium.googlesource.com/infra/infra.git', + 'deps_file': '.DEPS.git', + 'managed' : False, + } ], - } - return { - 'type': 'gclient_git', - 'gclient_git_spec': spec, + }, } @staticmethod diff --git a/recipes/infra_internal.py b/recipes/infra_internal.py index 3801e94f2..ad6afb9c3 100644 --- a/recipes/infra_internal.py +++ b/recipes/infra_internal.py @@ -25,18 +25,6 @@ class InfraInternal(recipe_util.Recipe): '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 {