Apply final changes to policy_PopupsAllowedForUrls test.
Somehow I failed upload the final changes made to files for
policy_PopupsAllowedForUrls and cros/enterprise_policy_base.py, when
I checked in CL 319635. This CL applies those final changes.
BUG=chromium:572947
TEST=Run test_that <IP> policy_PopupsAllowedForUrls
Change-Id: I12c996640f37923bee1e729fcd8094855297b3ef
Reviewed-on: https://chromium-review.googlesource.com/320250
Commit-Ready: Scott Cunningham <scunningham@chromium.org>
Tested-by: Scott Cunningham <scunningham@chromium.org>
Reviewed-by: Scott Cunningham <scunningham@chromium.org>
diff --git a/client/cros/enterprise_policy_base.py b/client/cros/enterprise_policy_base.py
index f994ea7..db99a4f 100644
--- a/client/cros/enterprise_policy_base.py
+++ b/client/cros/enterprise_policy_base.py
@@ -266,11 +266,6 @@
if not tab:
tab = self.cr.browser.tabs.New()
tab.Activate()
- """try:
- tab.Navigate(url, timeout=5)
- except Exception, err:
- logging.error('Timeout Exception navigating to URL: %s\n %s',
- url, err)"""
tab.Navigate(url, timeout=5)
tab.WaitForDocumentReadyStateToBeComplete()
return tab
diff --git a/client/site_tests/policy_PopupsAllowedForUrls/control b/client/site_tests/policy_PopupsAllowedForUrls/control
index 5f335ed..0b6f6f5 100644
--- a/client/site_tests/policy_PopupsAllowedForUrls/control
+++ b/client/site_tests/policy_PopupsAllowedForUrls/control
@@ -12,19 +12,18 @@
TEST_TYPE = "client"
DOC = """
-Verify effects of PopupsAllowedForUrls policy on client look and feel.
+Verify effects of PopupsAllowedForUrls policy on client behavior.
This test verifies the effect of the PopupsAllowedForUrls user policy on
-Chrome OS client behavior and appearance when the DefaultPopupsSetting policy
-is set to 2. It exercises a range of policy values using four unique test
-cases, named: NotSet, 1Url, 2Urls, and 3Urls. See the test file for a full
-description of what each test case does.
+Chrome OS client behavior when the DefaultPopupsSetting policy is set to 2.
+It exercises a range of policy values using four unique test cases, named:
+NotSet_Blocked, 1Url_Allowed, 2Urls_Blocked, and 3Urls_Allowed. See the test
+file for a full description of what each test case does.
-In general, a test shall pass if the browser only allows images to be shown
-on a test page that is in a domain listed in the PopupsAllowedForUrls policy.
-A test shall fail if the browser blocks images on a page where they should be
-allowed to be shown, or allows images to be shown on a page where they should
-be blocked.
+In general, a test shall pass if the browser only allows popups on a test page
+that is in a domain listed in the PopupsAllowedForUrls policy. A test shall
+fail if the browser blocks popups on a page where they should be allowed, or
+allows popups on a page where they should be blocked.
Usage example:
$ test_that <IPAddress> PopupsAllowedForUrls
diff --git a/client/site_tests/policy_PopupsAllowedForUrls/policy_PopupsAllowedForUrls.py b/client/site_tests/policy_PopupsAllowedForUrls/policy_PopupsAllowedForUrls.py
index 48fbed9..2c62cf4 100644
--- a/client/site_tests/policy_PopupsAllowedForUrls/policy_PopupsAllowedForUrls.py
+++ b/client/site_tests/policy_PopupsAllowedForUrls/policy_PopupsAllowedForUrls.py
@@ -7,7 +7,6 @@
from autotest_lib.client.common_lib import error
from autotest_lib.client.cros import enterprise_policy_base
-from autotest_lib.client.cros import httpd
class policy_PopupsAllowedForUrls(enterprise_policy_base.EnterprisePolicyTest):
@@ -60,12 +59,7 @@
def initialize(self, args=()):
super(policy_PopupsAllowedForUrls, self).initialize(args)
- if self.mode == 'list':
- self._web_server = None
- else:
- self._web_server = httpd.HTTPListener(
- self.URL_PORT, docroot=self.bindir)
- self._web_server.run()
+ self.start_webserver(self.URL_PORT)
def cleanup(self):
if self._web_server:
