Commit 9c8e93fa authored by Greg Thompson's avatar Greg Thompson Committed by Commit Bot

Fix value deletion in CleanRegistryEntry.

Registry value names must be expanded before use.

BUG=698997,1059314
R=zmin@chromium.org

Change-Id: I39bc0b31863f46fe2df9e3a873312b865771d3c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2137340
Auto-Submit: Greg Thompson <grt@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Reviewed-by: default avatarOwen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756648}
parent b32714e6
...@@ -194,6 +194,7 @@ def CleanRegistryEntry(expectation_name, expectation, variable_expander): ...@@ -194,6 +194,7 @@ def CleanRegistryEntry(expectation_name, expectation, variable_expander):
'Invalid expectation for CleanRegistryEntry operation: a \'values\' ' + 'Invalid expectation for CleanRegistryEntry operation: a \'values\' ' +
'dictionary is required for optional key %s' % key) 'dictionary is required for optional key %s' % key)
for value, value_expectation in expectation['values'].iteritems(): for value, value_expectation in expectation['values'].iteritems():
value = variable_expander.Expand(value)
assert 'type' not in value_expectation, ( assert 'type' not in value_expectation, (
'Invalid expectation for CleanRegistryEntry operation: value %s\\%s ' + 'Invalid expectation for CleanRegistryEntry operation: value %s\\%s ' +
'must not specify a \'type\'' % key, value) 'must not specify a \'type\'' % key, value)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment