diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py index 2d8bd721a7..b96102985f 100755 --- a/tools_webrtc/autoroller/roll_deps.py +++ b/tools_webrtc/autoroller/roll_deps.py @@ -50,7 +50,6 @@ CHECKOUT_ROOT_DIR = os.path.realpath(os.path.join(CHECKOUT_SRC_DIR, os.pardir)) sys.path.append(os.path.join(CHECKOUT_SRC_DIR, 'build')) import find_depot_tools find_depot_tools.add_depot_tools_to_path() -from gclient import GClientKeywords CLANG_UPDATE_SCRIPT_URL_PATH = 'tools/clang/scripts/update.py' CLANG_UPDATE_SCRIPT_LOCAL_PATH = os.path.join(CHECKOUT_SRC_DIR, 'tools', @@ -64,11 +63,14 @@ class RollError(Exception): pass +def VarLookup(local_scope): + return lambda var_name: local_scope['vars'][var_name] + + def ParseDepsDict(deps_content): local_scope = {} - var = GClientKeywords.VarImpl({}, local_scope) global_scope = { - 'Var': var.Lookup, + 'Var': VarLookup(local_scope), 'deps_os': {}, } exec(deps_content, global_scope, local_scope) diff --git a/tools_webrtc/autoroller/unittests/roll_deps_test.py b/tools_webrtc/autoroller/unittests/roll_deps_test.py index 65b5288b0b..dc2bacd385 100755 --- a/tools_webrtc/autoroller/unittests/roll_deps_test.py +++ b/tools_webrtc/autoroller/unittests/roll_deps_test.py @@ -82,6 +82,11 @@ class TestRollChromiumRevision(unittest.TestCase): self.assertEqual(self.fake.expectations, []) setattr(roll_deps, '_RunCommand', self.old_run_command) + def testVarLookup(self): + local_scope = {'foo': 'wrong', 'vars': {'foo': 'bar'}} + lookup = roll_deps.VarLookup(local_scope) + self.assertEquals(lookup('foo'), 'bar') + def testUpdateDepsFile(self): new_rev = 'aaaaabbbbbcccccdddddeeeeefffff0000011111'