diff options
| author | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-17 13:25:23 +0000 |
|---|---|---|
| committer | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-17 13:25:23 +0000 |
| commit | f8636972b3e1d3a9bbf7f86b6708c0f5d66571ae (patch) | |
| tree | 1cc358fe9fc57efd09b612b261d484ad359bf1fe /net/tools | |
| parent | d20e0b986707dd49ae7a2cad347f4e50140ec86e (diff) | |
| download | chromium_src-f8636972b3e1d3a9bbf7f86b6708c0f5d66571ae.zip chromium_src-f8636972b3e1d3a9bbf7f86b6708c0f5d66571ae.tar.gz chromium_src-f8636972b3e1d3a9bbf7f86b6708c0f5d66571ae.tar.bz2 | |
New policy protobuf protocol.
(Third attempt to land http://codereview.chromium.org/6409040/ -- now without memory leaks)
- cloud_policy.proto autogenerated from policy_templates.json
- C++ method decoding the protobuf also autogenerated from policy_templates.json
- changed policy fetching mechanism to fetch new-style policy protobufs
BUG=68309, chromium-os:11253, chromium-os:11255
TEST=CloudPolicyCacheTest.*; also manual test against python testserver
Review URL: http://codereview.chromium.org/6532019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/testserver/device_management.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/tools/testserver/device_management.py b/net/tools/testserver/device_management.py index 00254c1..ccf1ac8 100644 --- a/net/tools/testserver/device_management.py +++ b/net/tools/testserver/device_management.py @@ -95,7 +95,7 @@ class RequestHandler(object): unique. """ if not self._params: - self._params = cgi.parse_qs(self._path[self._path.find('?')+1:]) + self._params = cgi.parse_qs(self._path[self._path.find('?') + 1:]) param_list = self._params.get(name, []) if len(param_list) == 1: @@ -173,7 +173,6 @@ class RequestHandler(object): response = dm.DeviceManagementResponse() response.error = dm.DeviceManagementResponse.SUCCESS response.register_response.device_management_token = dmtoken - response.register_response.device_name = self.GetDeviceName() self.DumpMessage('Response', response) @@ -498,7 +497,7 @@ class TestServer(object): dmtoken_chars = [] while len(dmtoken_chars) < 32: dmtoken_chars.append(random.choice('0123456789abcdef')) - dmtoken= ''.join(dmtoken_chars) + dmtoken = ''.join(dmtoken_chars) self._registered_devices[dmtoken] = device_id return dmtoken |