Promote four stable policy_* tests to bvt-perbuild suite.
Move the tests from suite:regression to suite:bvt-perbuild.
Also, fix some minor typographical errors, and change '' to None in two tests.
BUG=chromium:624940
TEST=Run test_that for each test.
Change-Id: Ia081328860fc87abfd3a0fd7a5da7c293fdd4f5b
Reviewed-on: https://chromium-review.googlesource.com/357902
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/site_tests/policy_ImagesAllowedForUrls/control b/client/site_tests/policy_ImagesAllowedForUrls/control
index dd88c34..46d9321 100644
--- a/client/site_tests/policy_ImagesAllowedForUrls/control
+++ b/client/site_tests/policy_ImagesAllowedForUrls/control
@@ -4,7 +4,7 @@
AUTHOR = "scunningham"
NAME = "policy_ImagesAllowedForUrls"
-ATTRIBUTES = "suite:regression"
+ATTRIBUTES = "suite:bvt-perbuild"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "enterprise"
@@ -25,16 +25,6 @@
allowed to be shown, or allows images to be shown on a page where they should
be blocked.
-Usage example:
-$ test_that <IPAddress> ImagesAllowedForUrls --args="mode=single
-case=1Url_Allowed env=dm-test dms_name=xot-dmst username=test@crosprqa1.com
-password=test1234"
-
-Runs a single test case (e.g., 1Url_Allowed) against a device with the
-specified IP address, using the DM Test environment with the given DM Server
-name, and signing in to the device with the given username and password.
-
"""
job.run_test("policy_ImagesAllowedForUrls", args=args)
-
diff --git a/client/site_tests/policy_ImagesBlockedForUrls/control b/client/site_tests/policy_ImagesBlockedForUrls/control
index aaf7ef1..0b3149b 100644
--- a/client/site_tests/policy_ImagesBlockedForUrls/control
+++ b/client/site_tests/policy_ImagesBlockedForUrls/control
@@ -4,7 +4,7 @@
AUTHOR = "scunningham"
NAME = "policy_ImagesBlockedForUrls"
-ATTRIBUTES = "suite:regression"
+ATTRIBUTES = "suite:bvt-perbuild"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "enterprise"
@@ -24,16 +24,6 @@
case shall fail if the browser allows images to be shown on a page where they
should be blocked, or blocks images on a page where they should be shown.
-Usage example:
-$ test_that <IPAddress> ImagesBlockedForUrls --args="mode=single
-case=2Urls_Allowed env=dm-test dms_name=xot-dmst username=test@crosprqa1.com
-password=test1234"
-
-Runs a single test case (e.g., 2Urls_Allowed) using the specified DM Server
-environment, signing in with the specified username and password. Expectation
-is that the image on the page will be allowed (not blocked).
-
"""
job.run_test("policy_ImagesBlockedForUrls", args=args)
-
diff --git a/client/site_tests/policy_URLBlacklist/control b/client/site_tests/policy_URLBlacklist/control
index dfdc5dd..9362f2b 100644
--- a/client/site_tests/policy_URLBlacklist/control
+++ b/client/site_tests/policy_URLBlacklist/control
@@ -4,7 +4,7 @@
AUTHOR = "krishnargv"
NAME = "policy_URLBlacklist"
-ATTRIBUTES = "suite:regression"
+ATTRIBUTES = "suite:bvt-perbuild"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "enterprise"
@@ -18,10 +18,10 @@
cases, named: NotSet_Allowed, SinglePage_Blocked and MultiplePages_Blocked.
See the test file for a full description of what each test case does.
-A test case shall pass if the URLs that are not in the URLBlacklist policy
-value are allowed. The test case shall also pass if the URLs that are in
-the URLBlacklist policy value are blocked. A test case shall fail if the above
-behavior is not enforced.
+A test case shall pass if:
+ - Only URLs that are in the URLBlacklist policy value are blocked.
+ - All other URLs are allowed.
+The test case shall fail if the above behavior is not enforced.
"""
diff --git a/client/site_tests/policy_URLBlacklist/policy_URLBlacklist.py b/client/site_tests/policy_URLBlacklist/policy_URLBlacklist.py
index e9d0450..d46ed70 100644
--- a/client/site_tests/policy_URLBlacklist/policy_URLBlacklist.py
+++ b/client/site_tests/policy_URLBlacklist/policy_URLBlacklist.py
@@ -42,7 +42,7 @@
BLOCKED_ERROR_MESSAGE = 'ERR_BLOCKED_BY_ADMINISTRATOR'
TEST_CASES = {
- 'NotSet_Allowed': '',
+ 'NotSet_Allowed': None,
'SinglePage_Blocked': SINGLE_BLACKLISTED_FILE_DATA,
'MultiplePages_Blocked': MULTIPLE_BLACKLISTED_FILES_DATA,
}
@@ -125,7 +125,7 @@
' by policy, but was allowed.' % url)
elif url_is_blocked:
raise error.TestFail('The URL %s should have been allowed'
- 'by policy, but was blocked' % url)
+ 'by policy, but was blocked.' % url)
def run_test_case(self, case):
"""Setup and run the test configured for the specified test case.
diff --git a/client/site_tests/policy_URLWhitelist/control b/client/site_tests/policy_URLWhitelist/control
index 53b0b7b..d7eae16 100644
--- a/client/site_tests/policy_URLWhitelist/control
+++ b/client/site_tests/policy_URLWhitelist/control
@@ -4,7 +4,7 @@
AUTHOR = "krishnargv"
NAME = "policy_URLWhitelist"
-ATTRIBUTES = "suite:regression"
+ATTRIBUTES = "suite:bvt-perbuild"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "enterprise"
@@ -18,8 +18,8 @@
cases, named: NotSet_Blocked, SinglePage_Allowed and MultiplePages_Allowed.
See the test file for a full description of what each test case does.
-The test case shall pass if:
- - Only URLs that in the URLWhitelist policy value are allowed.
+A test case shall pass if:
+ - Only URLs that are in the URLWhitelist policy value are allowed.
- All other URLs are blocked.
The test case shall fail if the above behavior is not enforced.
diff --git a/client/site_tests/policy_URLWhitelist/policy_URLWhitelist.py b/client/site_tests/policy_URLWhitelist/policy_URLWhitelist.py
index b497e4d..2368718 100644
--- a/client/site_tests/policy_URLWhitelist/policy_URLWhitelist.py
+++ b/client/site_tests/policy_URLWhitelist/policy_URLWhitelist.py
@@ -16,10 +16,10 @@
verify that the websites not in the URLWhitelist policy value are blocked.
Two TEST_CASES (SinglePage_Allowed, MultiplePages_Allowed) are designed to
- verify that a website is allowed regardless of whether a SINGLE webpage is
- specified in the URLWhitelist policy, or if MULTIPLE webpages are
- specified. The third TEST_CASE (NotSet_Blocked) is designed to verify that
- all websites are blocked since the URLWhitelistlist policy is set to None.
+ verify that a website is allowed regardless of whether a single webpage is
+ specified in the URLWhitelist policy, or multiple webpages are specified.
+ The third TEST_CASE (NotSet_Blocked) is designed to verify that all
+ websites are blocked since the URLWhitelistlist policy is set to None.
The test case shall pass if the URLs that are part of the URLWhitelist
policy value are allowed. The test case shall also pass if the URLs that
@@ -43,7 +43,7 @@
BLOCKED_ERROR_MESSAGE = 'ERR_BLOCKED_BY_ADMINISTRATOR'
TEST_CASES = {
- 'NotSet_Blocked': '',
+ 'NotSet_Blocked': None,
'SinglePage_Allowed': SINGLE_WHITELISTED_FILE_DATA,
'MultiplePages_Allowed': MULTIPLE_WHITELISTED_FILES_DATA
}
@@ -128,11 +128,11 @@
elif url not in policy_value and not url_is_blocked:
raise error.TestFail('The URL %s should have been '
'blocked by policy, but it '
- 'was allowed' % url)
+ 'was allowed.' % url)
elif not url_is_blocked:
raise error.TestFail('The URL %s should have been blocked'
- 'by policy, but it was allowed' % url)
+ 'by policy, but it was allowed.' % url)
def run_test_case(self, case):
"""Setup and run the test configured for the specified test case.