diff options
| author | gfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-02 11:23:39 +0000 |
|---|---|---|
| committer | gfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-02 11:23:39 +0000 |
| commit | a92a5584983e4e4921ec8e73de08201d88f5bb89 (patch) | |
| tree | c09273e8f74026849350c3e08498a6c83ea5c78d /net/tools | |
| parent | ddbee737bbde09572a9f4aecb289551ee673a29c (diff) | |
| download | chromium_src-a92a5584983e4e4921ec8e73de08201d88f5bb89.zip chromium_src-a92a5584983e4e4921ec8e73de08201d88f5bb89.tar.gz chromium_src-a92a5584983e4e4921ec8e73de08201d88f5bb89.tar.bz2 | |
Fix device management testserver
Fix serving of policies after the recent config file format change.
BUG=none
TEST=Run the testserver with Chrome and check that policies are applied to Chrome.
Review URL: http://codereview.chromium.org/6246043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/testserver/device_management.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/tools/testserver/device_management.py b/net/tools/testserver/device_management.py index 183451b..00254c1 100644 --- a/net/tools/testserver/device_management.py +++ b/net/tools/testserver/device_management.py @@ -265,11 +265,12 @@ class RequestHandler(object): # Respond only if the client requested policy for the cros/device scope, # since that's where chrome policy is supposed to live in. - if msg.policy_scope == 'chromeos/device': + if msg.policy_scope in self._server.policy: + policy = self._server.policy[msg.policy_scope]['mandatory'] setting = response.policy_response.setting.add() setting.policy_key = 'chrome-policy' policy_value = dm.GenericSetting() - for (key, value) in self._server.policy.iteritems(): + for (key, value) in policy.iteritems(): entry = policy_value.named_value.add() entry.name = key entry_value = dm.GenericValue() |