diff options
| author | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 12:03:44 +0000 |
|---|---|---|
| committer | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-15 12:03:44 +0000 |
| commit | a44b9306fee73afcc610ac6e774163e5741e09f2 (patch) | |
| tree | 115f83b8a186cde360c34a65ec6136751b7dbd88 /net | |
| parent | 383121d35d2cbd84d6d00e2bb5c7c894dd95fd8a (diff) | |
| download | chromium_src-a44b9306fee73afcc610ac6e774163e5741e09f2.zip chromium_src-a44b9306fee73afcc610ac6e774163e5741e09f2.tar.gz chromium_src-a44b9306fee73afcc610ac6e774163e5741e09f2.tar.bz2 | |
Support decoding GenericNamedValue based policy.
Even if it arrives in the ChromeSettingsProto message where Chrome expects to find explicitly typed policy.
This is necessary for as long as CPanel/D3 deliver old-style policy. We include this fix on the client side to make a corresponding workaround in DMServer unnecessary.
BUG=chromium-os:14102
TEST=UserPolicyCacheTest.OldStylePolicy; manual test against DMServer without the server-side workaround
Review URL: http://codereview.chromium.org/6840014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/tools/testserver/device_management.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tools/testserver/device_management.py b/net/tools/testserver/device_management.py index c4ec75e..b62b2c0 100644 --- a/net/tools/testserver/device_management.py +++ b/net/tools/testserver/device_management.py @@ -352,7 +352,7 @@ class RequestHandler(object): if field.type == field.TYPE_BOOL: assert type(field_value) == bool elif field.type == field.TYPE_STRING: - assert type(field_value) == str + assert type(field_value) == str or type(field_value) == unicode elif field.type == field.TYPE_INT64: assert type(field_value) == int elif (field.type == field.TYPE_MESSAGE and |