summaryrefslogtreecommitdiffstats
path: root/chrome/test/pyautolib
diff options
context:
space:
mode:
authorcraigdh@chromium.org <craigdh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-21 21:15:45 +0000
committercraigdh@chromium.org <craigdh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-21 21:15:45 +0000
commit830074e64684ea4387f6013e47453f0fd17b62bb (patch)
treec49773c1892ef2e0f3bb32db1af30cbfaff281a5 /chrome/test/pyautolib
parente5e6e25f97934963c9e86c1a60e61b45621e59a3 (diff)
downloadchromium_src-830074e64684ea4387f6013e47453f0fd17b62bb.zip
chromium_src-830074e64684ea4387f6013e47453f0fd17b62bb.tar.gz
chromium_src-830074e64684ea4387f6013e47453f0fd17b62bb.tar.bz2
Added GetEnterprisePolicyInfo() automation hook.
GetEnterpriseInfo() will return a dictionary containing policy-related information as well as all Mandatory and Recommended policies. BUG=chromium-os:17872 TEST=Manual test Review URL: http://codereview.chromium.org/7399032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/pyautolib')
-rw-r--r--chrome/test/pyautolib/pyauto.py33
1 files changed, 32 insertions, 1 deletions
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index 860fd97..4bf630a19 100644
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -3426,6 +3426,33 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
result = self._GetResultFromJSONRequest(cmd_dict, windex=-1)
return result.get('enterprise')
+ def GetEnterprisePolicyInfo(self):
+ """Get details about enterprise policy on chromeos.
+
+ Returns:
+ A dictionary including information about the enterprise policy.
+ Sample:
+ {u'device_token_cache_loaded': True,
+ u'device_cloud_policy_state': u'success',
+ u'device_id': u'11111-222222222-33333333-4444444',
+ u'device_mandatory_policies': {},
+ u'device_recommended_policies': {},
+ u'device_token': u'ABjmT7nqGWTHRLO',
+ u'enterprise_domain': u'example.com',
+ u'gaia_token': u'',
+ u'machine_id': u'123456789',
+ u'machine_model': u'COMPUTER',
+ u'user_cache_loaded': True,
+ u'user_cloud_policy_state': u'success',
+ u'user_mandatory_policies': {u'AuthSchemes': u'',
+ u'AutoFillEnabled': True,
+ u'ChromeOsLockOnIdleSuspend': True}
+ u'user_recommended_policies': {},
+ u'user_name': u'user@example.com'}
+ """
+ cmd_dict = { 'command': 'GetEnterprisePolicyInfo' }
+ return self._GetResultFromJSONRequest(cmd_dict, windex=-1)
+
def FetchEnterprisePolicy(self):
"""Fetch enterprise policy from server.
@@ -3433,13 +3460,17 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
fails. This is separate from any auto policy fetches the device may perform
on its own.
+ Returns:
+ The dictionary of policy info obtained from GetEnterprisePolicyInfo().
+
Raises:
pyauto_errors.JSONInterfaceError if the fetch fails.
"""
cmd_dict = {
'command': 'FetchEnterprisePolicy',
}
- return self._GetResultFromJSONRequest(cmd_dict, windex=-1)
+ self._GetResultFromJSONRequest(cmd_dict, windex=-1)
+ return self.GetEnterprisePolicyInfo()
def GetUpdateInfo(self):
"""Gets the status of the ChromeOS updater.