summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authorjkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-16 09:36:09 +0000
committerjkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-16 09:36:09 +0000
commit43aca00e01ed07ffbbe18f72e08d2cc0d9dfe8cd (patch)
tree3ecf01593abb3493a44ca269ca521d562431be42 /net/tools
parentbe24d307cfb3aba57e4456063eb31207665ce657 (diff)
downloadchromium_src-43aca00e01ed07ffbbe18f72e08d2cc0d9dfe8cd.zip
chromium_src-43aca00e01ed07ffbbe18f72e08d2cc0d9dfe8cd.tar.gz
chromium_src-43aca00e01ed07ffbbe18f72e08d2cc0d9dfe8cd.tar.bz2
New policy protobuf protocol.
- cloud_policy.proto autogenerated from policy_templates.json - C++ method decoding the protobuf 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/6409040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rw-r--r--net/tools/testserver/device_management.py5
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