Add input playback tests to touch suite only.
Separate change will add the suite scheduler record.
Suite already in attributes list.
BUG=chromium:915296
TEST=None
Change-Id: If5edbf03e347b89e55d0ffb8c2ae953bde1393c5
Reviewed-on: https://chromium-review.googlesource.com/1419242
Commit-Ready: Kalin Stoyanov <kalin@chromium.org>
Tested-by: Kalin Stoyanov <kalin@chromium.org>
Reviewed-by: Kalin Stoyanov <kalin@chromium.org>
diff --git a/client/site_tests/touch_GestureNav/control b/client/site_tests/touch_GestureNav/control
index 8fe53d5..006fdfa 100644
--- a/client/site_tests/touch_GestureNav/control
+++ b/client/site_tests/touch_GestureNav/control
@@ -9,7 +9,7 @@
This test will fail if, after playback of two fingers for back/forward
long swipes, the active tab does not navigate as expected.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/client/site_tests/touch_HasInput/control.stylus b/client/site_tests/touch_HasInput/control.stylus
index 1e6c279..77b0dfd 100644
--- a/client/site_tests/touch_HasInput/control.stylus
+++ b/client/site_tests/touch_HasInput/control.stylus
@@ -8,7 +8,7 @@
CRITERIA = """
This test will fail if the device does not have stylus input.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/client/site_tests/touch_HasInput/control.touchpad b/client/site_tests/touch_HasInput/control.touchpad
index fcc7cc9..c3cdc72 100644
--- a/client/site_tests/touch_HasInput/control.touchpad
+++ b/client/site_tests/touch_HasInput/control.touchpad
@@ -8,7 +8,7 @@
CRITERIA = """
This test will fail if the device does not have touchpad input.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/client/site_tests/touch_HasInput/control.touchscreen b/client/site_tests/touch_HasInput/control.touchscreen
index 927a085..779629b 100644
--- a/client/site_tests/touch_HasInput/control.touchscreen
+++ b/client/site_tests/touch_HasInput/control.touchscreen
@@ -8,7 +8,7 @@
CRITERIA = """
This test will fail if the device does not have touchpad input.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/client/site_tests/touch_MouseScroll/control b/client/site_tests/touch_MouseScroll/control
index 4826ece..c5f5f2f 100644
--- a/client/site_tests/touch_MouseScroll/control
+++ b/client/site_tests/touch_MouseScroll/control
@@ -9,7 +9,7 @@
This test will fail if, after playback of emulated mouse events, the scrolling
does not match the expected direction or behavior.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/client/site_tests/touch_ScrollDirection/control b/client/site_tests/touch_ScrollDirection/control
index c9ea7aa..245004d 100644
--- a/client/site_tests/touch_ScrollDirection/control
+++ b/client/site_tests/touch_ScrollDirection/control
@@ -9,7 +9,7 @@
This test will fail if, after playback of touch events, no scrolling is detected
or if scrolling is in the wrong direction.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/client/site_tests/touch_StylusTaps/control b/client/site_tests/touch_StylusTaps/control
index b4aee6a..16e541a 100644
--- a/client/site_tests/touch_StylusTaps/control
+++ b/client/site_tests/touch_StylusTaps/control
@@ -9,7 +9,7 @@
This test will fail if, after playback of touch events, taps do not appear
on test page.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/client/site_tests/touch_TabSwitch/control b/client/site_tests/touch_TabSwitch/control
index 05344c6..a9fb19e 100644
--- a/client/site_tests/touch_TabSwitch/control
+++ b/client/site_tests/touch_TabSwitch/control
@@ -9,7 +9,7 @@
This test will fail if, after playback of three finger left/right swipes,
the active tab does not change as expected.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/client/site_tests/touch_TapSettings/control b/client/site_tests/touch_TapSettings/control
index 420f345..8098e0c 100644
--- a/client/site_tests/touch_TapSettings/control
+++ b/client/site_tests/touch_TapSettings/control
@@ -9,7 +9,7 @@
This test will fail if, after playback of touch events, tap-to-click or tap
dragging does not work when supposed to or works when not supposed to.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/client/site_tests/touch_TouchscreenScroll/control b/client/site_tests/touch_TouchscreenScroll/control
index 5e627c2..ef2f82b 100644
--- a/client/site_tests/touch_TouchscreenScroll/control
+++ b/client/site_tests/touch_TouchscreenScroll/control
@@ -9,7 +9,7 @@
This test will fail if, after playback of touchscreen events, no scrolling is
detected or if scrolling is in the wrong direction.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/client/site_tests/touch_TouchscreenTaps/control b/client/site_tests/touch_TouchscreenTaps/control
index 00cec91..0819392 100644
--- a/client/site_tests/touch_TouchscreenTaps/control
+++ b/client/site_tests/touch_TouchscreenTaps/control
@@ -9,7 +9,7 @@
This test will fail if, after playback of touch events, taps do not appear
on test page.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/client/site_tests/touch_TouchscreenZoom/control b/client/site_tests/touch_TouchscreenZoom/control
index c76f90f..44c92f5 100644
--- a/client/site_tests/touch_TouchscreenZoom/control
+++ b/client/site_tests/touch_TouchscreenZoom/control
@@ -9,7 +9,7 @@
This test will fail if, after playback of touch events, no zoom is detected
or if zoom behaves irregularly.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/client/site_tests/touch_UpdateErrors/control.stylus b/client/site_tests/touch_UpdateErrors/control.stylus
index f560b5f..64139f7 100644
--- a/client/site_tests/touch_UpdateErrors/control.stylus
+++ b/client/site_tests/touch_UpdateErrors/control.stylus
@@ -9,7 +9,7 @@
This test will fail if stylus device did not check for updates or if there
were errors.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/client/site_tests/touch_UpdateErrors/control.touchpad b/client/site_tests/touch_UpdateErrors/control.touchpad
index 5179ae5..f7c31ed 100644
--- a/client/site_tests/touch_UpdateErrors/control.touchpad
+++ b/client/site_tests/touch_UpdateErrors/control.touchpad
@@ -9,7 +9,7 @@
This test will fail if touchpad device did not check for updates or if there
were errors.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/client/site_tests/touch_UpdateErrors/control.touchscreen b/client/site_tests/touch_UpdateErrors/control.touchscreen
index 29b5c82..7586019 100644
--- a/client/site_tests/touch_UpdateErrors/control.touchscreen
+++ b/client/site_tests/touch_UpdateErrors/control.touchscreen
@@ -9,7 +9,7 @@
This test will fail if touchscreen did not check for updates or if there
were errors.
"""
-ATTRIBUTES = "suite:bvt-perbuild, suite:touch"
+ATTRIBUTES = "suite:touch"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
diff --git a/test_suites/control.touch b/test_suites/control.touch
new file mode 100644
index 0000000..ba908e6
--- /dev/null
+++ b/test_suites/control.touch
@@ -0,0 +1,34 @@
+# Copyright 2019 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTHOR = "chromeos-test"
+NAME = "touch"
+PURPOSE = "Tests basic touch input functionality."
+
+TIME = "SHORT"
+TEST_CATEGORY = "General"
+TEST_CLASS = "suite"
+TEST_TYPE = "Server"
+
+DOC = """
+Touch input playback based tests.
+
+@param build: The name of the image to test.
+ Ex: x86-mario-release/R17-1412.33.0-a1-b29
+@param board: The board to test on. Ex: x86-mario
+@param pool: The pool of machines to utilize for scheduling. If pool=None
+ board is used.
+@param check_hosts: require appropriate live hosts to exist in the lab.
+@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
+"""
+
+import common
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+
+args_dict['name'] = 'touch'
+args_dict['add_experimental'] = True
+args_dict['max_runtime_mins'] = 60
+args_dict['job'] = job
+
+dynamic_suite.reimage_and_run(**args_dict)