Promote two stable tests to bvt-perbuild suite.
Move policy_ForceGoogleSafeSearch and policy_ForceYouTubeSafetyMode from
suite:regression to suite:bvt-perbuild.
BUG=chromium:614433
TEST=Run test_that <IP> policy_ForceGoogleSafeSearch, and
policy_ForceYouTubeSafetyMode
Change-Id: I42e92b1613facab81367ff5d2388339e5191c24b
Reviewed-on: https://chromium-review.googlesource.com/347022
Commit-Ready: Scott Cunningham <scunningham@chromium.org>
Tested-by: Scott Cunningham <scunningham@chromium.org>
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
diff --git a/client/site_tests/policy_ForceGoogleSafeSearch/control b/client/site_tests/policy_ForceGoogleSafeSearch/control
index a2fccc7..573b51d 100644
--- a/client/site_tests/policy_ForceGoogleSafeSearch/control
+++ b/client/site_tests/policy_ForceGoogleSafeSearch/control
@@ -4,7 +4,7 @@
AUTHOR = "scunningham"
NAME = "policy_ForceGoogleSafeSearch"
-ATTRIBUTES = "suite:regression"
+ATTRIBUTES = "suite:bvt-perbuild"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "enterprise"
@@ -15,19 +15,13 @@
This test verifies the effect of the ForceGoogleSafeSearch user policy on
Chrome OS client behavior. The test exercises all valid policy values across
-three test cases: NotSet_NotSafe, False_NotSafe, and True_SafeSearch.
+three test cases: NotSet_NotSafe, False_NotSafe, and True_Safe.
A test case shall pass if the omnibox search URL appends (or does not
append) a safe search parameter when the policy is set true (or is set
false or not set). A test case shall fail if the above behavior is not
enforced.
-Default usage example:
-$ test_that <IPAddress> policy_ForceGoogleSafeSearch
-
-The above runs all test cases using the local AutoTest fake DM server, and
-with the policy data and expected values set as defined by each test case.
-
"""
job.run_test("policy_ForceGoogleSafeSearch", args=args)
diff --git a/client/site_tests/policy_ForceGoogleSafeSearch/policy_ForceGoogleSafeSearch.py b/client/site_tests/policy_ForceGoogleSafeSearch/policy_ForceGoogleSafeSearch.py
index 5d0e654..9dcce27 100644
--- a/client/site_tests/policy_ForceGoogleSafeSearch/policy_ForceGoogleSafeSearch.py
+++ b/client/site_tests/policy_ForceGoogleSafeSearch/policy_ForceGoogleSafeSearch.py
@@ -14,7 +14,7 @@
This test verifies that the ForceGoogleSafeSearch user policy controls
whether Chrome OS enforces the use of Google Safe Search. The test covers
all valid policy values across three test cases: NotSet_NotSafe,
- False_NotSafe, and True_SafeSearch.
+ False_NotSafe, and True_Safe.
A test case shall pass if the omnibox appends (or does not append) the
safe parameter to the search URL when the policy is set true (or is set
diff --git a/client/site_tests/policy_ForceYouTubeSafetyMode/control b/client/site_tests/policy_ForceYouTubeSafetyMode/control
index 17f3c19..51c34e7 100644
--- a/client/site_tests/policy_ForceYouTubeSafetyMode/control
+++ b/client/site_tests/policy_ForceYouTubeSafetyMode/control
@@ -4,7 +4,7 @@
AUTHOR = "scunningham"
NAME = "policy_ForceYouTubeSafetyMode"
-ATTRIBUTES = "suite:regression"
+ATTRIBUTES = "suite:bvt-perbuild"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "enterprise"
diff --git a/client/site_tests/policy_ForceYouTubeSafetyMode/policy_ForceYouTubeSafetyMode.py b/client/site_tests/policy_ForceYouTubeSafetyMode/policy_ForceYouTubeSafetyMode.py
index b447883..628fd46 100644
--- a/client/site_tests/policy_ForceYouTubeSafetyMode/policy_ForceYouTubeSafetyMode.py
+++ b/client/site_tests/policy_ForceYouTubeSafetyMode/policy_ForceYouTubeSafetyMode.py
@@ -22,7 +22,7 @@
inactive if the user has not set the mode.
The test covers all valid policy values across three test cases:
- NotSet_SafetyInactive, False_SafetyInactive, True_SafetyActivetyActive.
+ NotSet_SafetyInactive, False_SafetyInactive, True_SafetyActive.
A test case passes when https://www.youtube.com page indicates that
'Restricted Mode' is On (or Off) when the policy is set true (or set false
diff --git a/client/site_tests/policy_ManagedBookmarks/control b/client/site_tests/policy_ManagedBookmarks/control
index 8a71d33..1ff8d09 100644
--- a/client/site_tests/policy_ManagedBookmarks/control
+++ b/client/site_tests/policy_ManagedBookmarks/control
@@ -24,7 +24,7 @@
is not enforced.
Default usage example:
-$ test_that <IPAddress> ManagedBookmarks
+$ test_that <IPAddress> policy_ManagedBookmarks
Runs both test cases using the local AutoTest fake DM server, and with
the policy json and expected values as defined by each test case.