summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-14 01:06:21 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-14 01:06:21 +0000
commit797364604e398aed396c57ad8746afe115a7ad70 (patch)
tree0cda1d1e6ac669112b6201a286478de0695847dc
parentad938c6ff51be58e39abf0e1261c6eca68d6d0b0 (diff)
downloadchromium_src-797364604e398aed396c57ad8746afe115a7ad70.zip
chromium_src-797364604e398aed396c57ad8746afe115a7ad70.tar.gz
chromium_src-797364604e398aed396c57ad8746afe115a7ad70.tar.bz2
Fixed the testPolicyToPrefMapping pyauto.
The ExtensionInstallSources policy was mapped to the wrong pref name. BUG=132100 TEST=This pyauto passes Review URL: https://chromiumcodereview.appspot.com/10540150 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142053 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/functional/PYAUTO_TESTS4
-rwxr-xr-xchrome/test/functional/policy_test_cases.py2
2 files changed, 1 insertions, 5 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS
index e530a57..c5460e2 100644
--- a/chrome/test/functional/PYAUTO_TESTS
+++ b/chrome/test/functional/PYAUTO_TESTS
@@ -163,8 +163,6 @@
'-passwords.PasswordTest.testSavedPasswordInTabsAndWindows',
# crbug.com/103379
'-policy.PolicyTest.testDisable3DAPIs',
- # crbug.com/132100
- '-policy.PolicyTest.testPolicyToPrefMapping',
# crbug.com/104227
'-sync.SyncIntegrationTest',
# crbug.com/88679
@@ -269,8 +267,6 @@
'-omnibox.OmniboxTest.testOmniboxSearchHistory',
# crbug.com/103379
'-policy.PolicyTest.testDisable3DAPIs',
- # crbug.com/132100
- '-policy.PolicyTest.testPolicyToPrefMapping',
# Gnome / kwallet popups on linux break sync tests. crbug.com/80329
'-sync',
# crbug.com/66072
diff --git a/chrome/test/functional/policy_test_cases.py b/chrome/test/functional/policy_test_cases.py
index 0a16076..7965bf2 100755
--- a/chrome/test/functional/policy_test_cases.py
+++ b/chrome/test/functional/policy_test_cases.py
@@ -138,7 +138,7 @@ class PolicyPrefsTestCases(object):
('kExtensionInstallForceList', ['lcncmkcnkcdbbanbjakcencbaoegdjlp;' +
'https://clients2.google.com/service/update2/crx'], [], OS_ALL),
'ExtensionInstallSources':
- ('kExtensionInstallSources', ['https://www.corp.monkey.net/*'],
+ ('kExtensionAllowedInstallSites', ['https://www.corp.monkey.net/*'],
[], OS_ALL),
'ShowHomeButton': ('kShowHomeButton', True, [BROWSER], OS_ALL),
'DeveloperToolsDisabled': ('kDevToolsDisabled', True, [], OS_ALL),