Move flaky experimental bvts to the regression suite
BUG=chromium-os:36086
TEST=None
Change-Id: I9ba11916efd402a75d7323eef1a7da0f2b71a4fe
Reviewed-on: https://gerrit.chromium.org/gerrit/37651
Reviewed-by: Dennis Jeffrey <dennisjeffrey@chromium.org>
Reviewed-by: Craig Harrison <craigdh@chromium.org>
Tested-by: Prashanth Balasubramanian <beeps@chromium.org>
diff --git a/client/site_tests/desktopui_DocViewing/control b/client/site_tests/desktopui_DocViewing/control
index 966b1b4..8665a14 100644
--- a/client/site_tests/desktopui_DocViewing/control
+++ b/client/site_tests/desktopui_DocViewing/control
@@ -10,8 +10,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "desktopui"
TEST_TYPE = "client"
-SUITE = "bvt"
-EXPERIMENTAL = "True"
+SUITE = "regression"
DOC = """
Tests for viewing Office documents in File Manager.
diff --git a/client/site_tests/desktopui_LoadBigFile/control b/client/site_tests/desktopui_LoadBigFile/control
index c5316d8..5e60c50 100644
--- a/client/site_tests/desktopui_LoadBigFile/control
+++ b/client/site_tests/desktopui_LoadBigFile/control
@@ -9,8 +9,7 @@
This test will fail if the tab fails to load in the default PyAuto timeout.
"""
# This test should be converted to performance test (http://crosbug.com/34881).
-# SUITE = "bvt"
-EXPERIMENTAL = "True"
+# SUITE = "regression"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "desktopui"
diff --git a/client/site_tests/desktopui_NaClSanity/control b/client/site_tests/desktopui_NaClSanity/control
index a230f0a..fc202d7 100644
--- a/client/site_tests/desktopui_NaClSanity/control
+++ b/client/site_tests/desktopui_NaClSanity/control
@@ -10,7 +10,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "desktopui"
TEST_TYPE = "client"
-SUITE = "bvt, smoke"
+SUITE = "regression"
DOC = """
Sanity test for Native Client (NaCl).
diff --git a/client/site_tests/enterprise_DevicePolicy/control b/client/site_tests/enterprise_DevicePolicy/control
index caa1505..74a0b97 100644
--- a/client/site_tests/enterprise_DevicePolicy/control
+++ b/client/site_tests/enterprise_DevicePolicy/control
@@ -10,8 +10,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "desktopui"
TEST_TYPE = "client"
-SUITE = "bvt"
-EXPERIMENTAL = "True"
+SUITE = "regression"
DOC = """
Tests for device policy.
diff --git a/client/site_tests/hardware_SAT/control b/client/site_tests/hardware_SAT/control
index 62014da..b506a63 100644
--- a/client/site_tests/hardware_SAT/control
+++ b/client/site_tests/hardware_SAT/control
@@ -23,7 +23,6 @@
"""
NAME = 'hardware_SAT'
SUITE = "kernel_per-build_regression"
-EXPERIMENTAL = "True"
TEST_CLASS = "hardware"
TEST_CATEGORY = 'Stress'
TEST_TYPE = 'client'
diff --git a/client/site_tests/login_RemoteLogin/control b/client/site_tests/login_RemoteLogin/control
index e0460f1..0a1211a 100644
--- a/client/site_tests/login_RemoteLogin/control
+++ b/client/site_tests/login_RemoteLogin/control
@@ -6,7 +6,7 @@
NAME = "login_RemoteLogin"
PURPOSE = "Verify login succeeds against the live Google Accounts server."
CRITERIA = "Test will fail if login fails for any reason."
-SUITE = "bvt, kaen_bvt"
+SUITE = "regression"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "login"
diff --git a/client/site_tests/platform_KernelVersion/control b/client/site_tests/platform_KernelVersion/control
index bd332d4..c1e7c98 100644
--- a/client/site_tests/platform_KernelVersion/control
+++ b/client/site_tests/platform_KernelVersion/control
@@ -6,8 +6,7 @@
NAME = "platform_KernelVersion"
PURPOSE = "Ensure the running kernel is supported."
CRITERIA = "Fails if the running kernel version is older than kernel_version."
-SUITE = "bvt, kaen_bvt, hwqual"
-EXPERIMENTAL = "True"
+SUITE = "regression, hwqual"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_Pkcs11InitOnLogin/control b/client/site_tests/platform_Pkcs11InitOnLogin/control
index 8bbecc7..12e8979 100644
--- a/client/site_tests/platform_Pkcs11InitOnLogin/control
+++ b/client/site_tests/platform_Pkcs11InitOnLogin/control
@@ -6,8 +6,7 @@
NAME = "platform_Pkcs11InitOnLogin"
PURPOSE = "Tests PKCS#11 initialization on login"
CRITERIA = "Fails if initialization fails during login."
-EXPERIMENTAL = "True"
-SUITE = "bvt, kaen_bvt"
+SUITE = "regression"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_Pkcs11InitUnderErrors/control b/client/site_tests/platform_Pkcs11InitUnderErrors/control
index b4bc5f7..d91e299 100644
--- a/client/site_tests/platform_Pkcs11InitUnderErrors/control
+++ b/client/site_tests/platform_Pkcs11InitUnderErrors/control
@@ -6,8 +6,7 @@
NAME = "platform_Pkcs11InitUnderErrors"
PURPOSE = "Tests PKCS#11 initialization under various system states."
CRITERIA = "Fails if initialization fails under any of the initial states."
-EXPERIMENTAL = "True"
-SUITE = "bvt, kaen_bvt"
+SUITE = "regression"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_Pkcs11LoadPerf/control b/client/site_tests/platform_Pkcs11LoadPerf/control
index c416f93..3dee630 100644
--- a/client/site_tests/platform_Pkcs11LoadPerf/control
+++ b/client/site_tests/platform_Pkcs11LoadPerf/control
@@ -6,7 +6,6 @@
NAME = "platform_Pkcs11LoadPerf"
PURPOSE = "Tests the performance of loading a PKCS #11 token."
CRITERIA = "Fails if performance does not meet constraints."
-EXPERIMENTAL = "True"
SUITE = "regression"
TIME = "SHORT"
TEST_CATEGORY = "Performance"
diff --git a/client/site_tests/platform_Pkcs11Persistence/control b/client/site_tests/platform_Pkcs11Persistence/control
index 493ff14..18a86e3 100644
--- a/client/site_tests/platform_Pkcs11Persistence/control
+++ b/client/site_tests/platform_Pkcs11Persistence/control
@@ -6,8 +6,7 @@
NAME = "platform_Pkcs11Persistence"
PURPOSE = "Tests PKCS#11 object persistence across logins."
CRITERIA = "Fails if a test key no longer exists on subsequent login."
-EXPERIMENTAL = "True"
-SUITE = "bvt, kaen_bvt"
+SUITE = "regression"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
diff --git a/client/site_tests/security_RendererSandbox/control b/client/site_tests/security_RendererSandbox/control
index b7c3efa..fdea8a2 100644
--- a/client/site_tests/security_RendererSandbox/control
+++ b/client/site_tests/security_RendererSandbox/control
@@ -6,8 +6,7 @@
sandboxed/jailed.
"""
TIME = "SHORT"
-SUITE = "bvt"
-EXPERIMENTAL = "True"
+SUITE = "regression"
TEST_CATEGORY = "Security"
TEST_CLASS = "security"
TEST_TYPE = "client"
diff --git a/client/site_tests/security_SeccompSyscallFilters/control b/client/site_tests/security_SeccompSyscallFilters/control
index bc7982d..59e79de 100644
--- a/client/site_tests/security_SeccompSyscallFilters/control
+++ b/client/site_tests/security_SeccompSyscallFilters/control
@@ -11,8 +11,7 @@
"""
PURPOSE = "To verify that seccomp is correctly changing permissions"
CRITERIA = "Permissions are changed to expected values after seccomp calls"
-SUITE = "bvt"
-EXPERIMENTAL = "True"
+SUITE = "regression"
TEST_CLASS = "security"
TEST_CATEGORY = "Functional"
TEST_TYPE = "client"
