admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix autoroller in accordance to upstream change

Browse Source 
This broke WebRTC's presubmit
e79ddeaabf%5E%21/

GClientKeywords has been removed and replaced with a more direct substitution.

BUG=None
NOTRY=True

Review-Url: https://codereview.webrtc.org/2989603002
Cr-Commit-Position: refs/heads/master@{#19126}
This commit is contained in:
oprypin 2017-07-25 01:57:17 -07:00 committed by Commit Bot
parent ec390b5dfb
commit 1e64cfae53
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools_webrtc/autoroller/roll_deps.py
View File

@ -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')) sys.path.append(os.path.join(CHECKOUT_SRC_DIR, 'build'))
import find_depot_tools import find_depot_tools
find_depot_tools.add_depot_tools_to_path() 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_URL_PATH = 'tools/clang/scripts/update.py'
CLANG_UPDATE_SCRIPT_LOCAL_PATH = os.path.join(CHECKOUT_SRC_DIR, 'tools', CLANG_UPDATE_SCRIPT_LOCAL_PATH = os.path.join(CHECKOUT_SRC_DIR, 'tools',
@ -64,11 +63,14 @@ class RollError(Exception):
pass pass
def VarLookup(local_scope):
return lambda var_name: local_scope['vars'][var_name]
def ParseDepsDict(deps_content): def ParseDepsDict(deps_content):
local_scope = {} local_scope = {}
var = GClientKeywords.VarImpl({}, local_scope)
global_scope = { global_scope = {
'Var': var.Lookup, 'Var': VarLookup(local_scope),
'deps_os': {}, 'deps_os': {},
} }
exec(deps_content, global_scope, local_scope) exec(deps_content, global_scope, local_scope)

5
tools_webrtc/autoroller/unittests/roll_deps_test.py
View File

@ -82,6 +82,11 @@ class TestRollChromiumRevision(unittest.TestCase):
self.assertEqual(self.fake.expectations, []) self.assertEqual(self.fake.expectations, [])
setattr(roll_deps, '_RunCommand', self.old_run_command) 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): def testUpdateDepsFile(self):
new_rev = 'aaaaabbbbbcccccdddddeeeeefffff0000011111' new_rev = 'aaaaabbbbbcccccdddddeeeeefffff0000011111'