Move all experimental BVT tests to the 'experimental' suite.
This is being done right away in order to reduce load on the lab
inventory.
BUG=None
TEST=None
Change-Id: Ide552e8b601299bdc1300159a1c461a61ffe5556
Reviewed-on: https://chromium-review.googlesource.com/199418
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
diff --git a/client/site_tests/desktopui_FlashSanityCheck/control b/client/site_tests/desktopui_FlashSanityCheck/control
index b573e26..cab7704 100644
--- a/client/site_tests/desktopui_FlashSanityCheck/control
+++ b/client/site_tests/desktopui_FlashSanityCheck/control
@@ -6,12 +6,11 @@
NAME = "desktopui_FlashSanityCheck"
PURPOSE = "Basic sanity check of Flash suppport in Chrome."
CRITERIA = "This test will fail if flash causes a segfault."
-SUITE = "bvt"
+SUITE = "experimental"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "desktopui"
TEST_TYPE = "client"
-EXPERIMENTAL = "True"
DOC = """
This test logs in, opens a new window, and navigates to a .swf file on a
diff --git a/client/site_tests/desktopui_ScreenLocker/control b/client/site_tests/desktopui_ScreenLocker/control
index 2df2373..71918e2 100644
--- a/client/site_tests/desktopui_ScreenLocker/control
+++ b/client/site_tests/desktopui_ScreenLocker/control
@@ -10,12 +10,11 @@
autotestPrivate.lockScreen, or cannot be unlocked with the correct password,
or if the screen is unlocked with an incorrect password.
"""
-SUITE = "bvt"
+SUITE = "experimental"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "desktopui"
TEST_TYPE = "client"
-EXPERIMENTAL = "True"
DOC = """
This test checks if the screen locker can lock and unlock the screen.
diff --git a/client/site_tests/graphics_GpuReset/control b/client/site_tests/graphics_GpuReset/control
index 9d58a92..680de71 100644
--- a/client/site_tests/graphics_GpuReset/control
+++ b/client/site_tests/graphics_GpuReset/control
@@ -8,8 +8,7 @@
CRITERIA = """
Detection of udev event notification of a GPU hang.
"""
-SUITE = 'bvt, graphics'
-EXPERIMENTAL = 'True'
+SUITE = 'graphics'
TIME='MEDIUM'
TEST_CATEGORY = 'Functional'
TEST_CLASS = "gl"
diff --git a/client/site_tests/graphics_SanAngeles/control b/client/site_tests/graphics_SanAngeles/control
index c73f2b8..a1cb902 100644
--- a/client/site_tests/graphics_SanAngeles/control
+++ b/client/site_tests/graphics_SanAngeles/control
@@ -6,8 +6,7 @@
NAME = 'graphics_SanAngeles'
PURPOSE = 'Benchmark OpenGL object rendering.'
CRITERIA = 'This test is a benchmark. It will fail if it fails to complete.'
-SUITE = 'bvt, graphics'
-EXPERIMENTAL = 'True'
+SUITE = 'graphics'
TIME='MEDIUM'
TEST_CATEGORY = 'Performance'
TEST_CLASS = "graphics"
diff --git a/client/site_tests/kernel_fs_Inplace/control b/client/site_tests/kernel_fs_Inplace/control
index 401d044..0075f05 100644
--- a/client/site_tests/kernel_fs_Inplace/control
+++ b/client/site_tests/kernel_fs_Inplace/control
@@ -7,8 +7,7 @@
DOC = '''
Does inplace preads and pwrites.
'''
-SUITE = "bvt"
-EXPERIMENTAL = "True"
+SUITE = "experimental"
TIME = 'SHORT'
TEST_CLASS = 'kernel'
TEST_CATEGORY = 'Performance'
diff --git a/client/site_tests/login_Cryptohome/control b/client/site_tests/login_Cryptohome/control
index 1236ec6..e7d57a4 100644
--- a/client/site_tests/login_Cryptohome/control
+++ b/client/site_tests/login_Cryptohome/control
@@ -8,12 +8,11 @@
CRITERIA = """
This test will fail if cryptohome is mounted when not logged in, or vice versa.
"""
-SUITE = "bvt, smoke"
+SUITE = "experimental, smoke"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "login"
TEST_TYPE = "client"
-EXPERIMENTAL = "True"
DOC = """
This test checks that a cryptohome was mounted only after logging in.
diff --git a/client/site_tests/login_OwnershipTaken/control b/client/site_tests/login_OwnershipTaken/control
index 2485e6e..3705d9f 100644
--- a/client/site_tests/login_OwnershipTaken/control
+++ b/client/site_tests/login_OwnershipTaken/control
@@ -4,12 +4,11 @@
AUTHOR = "cmasone, mnissler"
NAME = "login_OwnershipTaken"
-SUITE = "bvt, smoke"
+SUITE = "experimental, smoke"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "login"
TEST_TYPE = "client"
-EXPERIMENTAL = "True"
DOC = """
This test will log a test user in through the login manager, and then simulate
diff --git a/client/site_tests/p2p_ServeFiles/control b/client/site_tests/p2p_ServeFiles/control
index 062f195..28b6eb9 100644
--- a/client/site_tests/p2p_ServeFiles/control
+++ b/client/site_tests/p2p_ServeFiles/control
@@ -12,8 +12,7 @@
NAME = 'p2p_ServeFiles'
PURPOSE = 'Check that p2p-http-server daemon serves files over HTTP.'
CRITERIA = "Fails if the DUT can't serve a HTTP request from the network."
-SUITE = 'bvt'
-EXPERIMENTAL = 'True'
+SUITE = 'experimental'
TEST_CLASS = 'platform'
TEST_CATEGORY = 'Functional'
TEST_TYPE = 'client'
diff --git a/client/site_tests/platform_CryptohomeChangePassword/control b/client/site_tests/platform_CryptohomeChangePassword/control
index b798d23..18a2ee3 100644
--- a/client/site_tests/platform_CryptohomeChangePassword/control
+++ b/client/site_tests/platform_CryptohomeChangePassword/control
@@ -6,7 +6,7 @@
NAME = "platform_CryptohomeChangePassword"
PURPOSE = "Verify that cryptohome can change a password for an ecrypted vault."
CRITERIA = "This test will fail if cryptohome fails to re-wrap the vault key with the new password."
-SUITE = "bvt"
+SUITE = "experimental"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_CryptohomeMount/control b/client/site_tests/platform_CryptohomeMount/control
index 9bc6ee7..34224a0 100644
--- a/client/site_tests/platform_CryptohomeMount/control
+++ b/client/site_tests/platform_CryptohomeMount/control
@@ -6,13 +6,12 @@
NAME = "platform_CryptohomeMount"
PURPOSE = "Verify that cryptohome can create and mount an ecrypted vault."
CRITERIA = "This test will fail if cryptohome is not mounted after a call to mount."
-SUITE = "bvt"
+SUITE = "experimental"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
TEST_TYPE = "client"
RETRIES = 3
-EXPERIMENTAL = "True"
DOC = """
This test checks that cryptohome can create and mount an encrypted vault.
diff --git a/client/site_tests/platform_CryptohomeTestAuth/control b/client/site_tests/platform_CryptohomeTestAuth/control
index 919c091..b951dd5 100644
--- a/client/site_tests/platform_CryptohomeTestAuth/control
+++ b/client/site_tests/platform_CryptohomeTestAuth/control
@@ -6,8 +6,7 @@
NAME = "platform_CryptohomeTestAuth"
PURPOSE = "Verify that cryptohome can verify credentials."
CRITERIA = "This test will fail if cryptohome fails to validate credentials."
-SUITE = "bvt"
-EXPERIMENTAL = "true"
+SUITE = "experimental"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_GesturesRegressionTest/control b/client/site_tests/platform_GesturesRegressionTest/control
index 8301701..9b23801 100644
--- a/client/site_tests/platform_GesturesRegressionTest/control
+++ b/client/site_tests/platform_GesturesRegressionTest/control
@@ -5,8 +5,7 @@
AUTHOR = "Chromium OS Authors"
NAME = "platform_GesturesRegressionTests"
PURPOSE = "Regression tests of ChromeOS gestures library."
-SUITE = "bvt"
-EXPERIMENTAL = "True"
+SUITE = "experimental"
TIME = "SHORT"
TEST_CATEGORY = "Regression"
TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_Pkcs11ChangeAuthData/control b/client/site_tests/platform_Pkcs11ChangeAuthData/control
index 4157b26..4f11898 100644
--- a/client/site_tests/platform_Pkcs11ChangeAuthData/control
+++ b/client/site_tests/platform_Pkcs11ChangeAuthData/control
@@ -6,8 +6,7 @@
NAME = "platform_Pkcs11ChangeAuthData"
PURPOSE = "Tests changing authorization data for a PKCS #11 token."
CRITERIA = "Fails if token does not correctly change authorization data."
-EXPERIMENTAL = "True"
-SUITE= "bvt"
+SUITE= "experimental"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_Pkcs11Events/control b/client/site_tests/platform_Pkcs11Events/control
index e9d9938..5e10f72 100644
--- a/client/site_tests/platform_Pkcs11Events/control
+++ b/client/site_tests/platform_Pkcs11Events/control
@@ -6,8 +6,7 @@
NAME = "platform_Pkcs11Events"
PURPOSE = "Tests the response of the PKCS #11 system to login events."
CRITERIA = "Fails if the PKCS #11 system does not respond correctly to events."
-EXPERIMENTAL = "True"
-SUITE = "bvt"
+SUITE = "experimental"
TIME = "SHORT"
TEST_CATEGORY = "Stress"
TEST_CLASS = "platform"
diff --git a/client/site_tests/power_Resume/control b/client/site_tests/power_Resume/control
index 5ba1b48..beee4cd 100644
--- a/client/site_tests/power_Resume/control
+++ b/client/site_tests/power_Resume/control
@@ -6,12 +6,11 @@
NAME = "power_Resume"
PURPOSE = "Measure the amount of time it takes to resume from suspend."
CRITERIA = "This test is a benchmark."
-SUITE = "bvt, power_build"
+SUITE = "power_build"
TIME = "SHORT"
TEST_CATEGORY = "Logging"
TEST_CLASS = "power"
TEST_TYPE = "client"
-EXPERIMENTAL = "True"
DOC = """
This test will search /var/log/messages for pertinent strings to determine if
diff --git a/client/site_tests/video_VideoEncodeAccelerator/control.h264.bvt b/client/site_tests/video_VideoEncodeAccelerator/control.h264.bvt
index ba5f914..5de0bc3 100644
--- a/client/site_tests/video_VideoEncodeAccelerator/control.h264.bvt
+++ b/client/site_tests/video_VideoEncodeAccelerator/control.h264.bvt
@@ -10,13 +10,12 @@
fails. Running video_encode_accelerator_unittest is skipped on machines that are
known not to support video encode.
"""
-SUITE = "bvt, video"
+SUITE = "video"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "video"
TEST_TYPE = "client"
DEPENDENCIES = 'hw_video_acc_enc_h264'
-EXPERIMENTAL = 'True'
DOC = """
This is a wrapper test for Chrome video_encode_accelerator_unittest.
diff --git a/client/site_tests/video_VideoEncodeAccelerator/control.vp8.bvt b/client/site_tests/video_VideoEncodeAccelerator/control.vp8.bvt
index 0d3c927..9418909 100644
--- a/client/site_tests/video_VideoEncodeAccelerator/control.vp8.bvt
+++ b/client/site_tests/video_VideoEncodeAccelerator/control.vp8.bvt
@@ -10,13 +10,12 @@
fails. Running video_encode_accelerator_unittest is skipped on machines that are
known not to support video encode.
"""
-SUITE = "bvt, video"
+SUITE = "video"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "video"
TEST_TYPE = "client"
DEPENDENCIES = 'hw_video_acc_enc_vp8'
-EXPERIMENTAL = 'True'
DOC = """
This is a wrapper test for Chrome video_encode_accelerator_unittest.
diff --git a/client/site_tests/video_VideoSanity/control.bvt b/client/site_tests/video_VideoSanity/control.bvt
index d7857d9..b7a2d12 100644
--- a/client/site_tests/video_VideoSanity/control.bvt
+++ b/client/site_tests/video_VideoSanity/control.bvt
@@ -8,12 +8,11 @@
CRITERIA = """
This test will fail if Chrome media is not enable or video doesn't play.
"""
-SUITE = "bvt"
+SUITE = "experimental"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "video"
TEST_TYPE = "client"
-EXPERIMENTAL = "True"
DOC = """
This test verify the media elements and video sanity.
diff --git a/server/site_tests/platform_RebootAfterUpdate/control b/server/site_tests/platform_RebootAfterUpdate/control
index eea060f..670dd5d 100644
--- a/server/site_tests/platform_RebootAfterUpdate/control
+++ b/server/site_tests/platform_RebootAfterUpdate/control
@@ -10,8 +10,7 @@
TEST_CATEGORY = "Benchmark"
TEST_CLASS = "platform"
TEST_TYPE = "server"
-SUITE = "bvt"
-EXPERIMENTAL = "True"
+SUITE = "experimental"
DOC = """
This test checks the behavior of reboot after update. It specifically tests
