Relax the hw id match from FW updater log.
- move hw_id within match of updater string
- also changing test dependency to match only late provision boards
BUG=chromium:863516
TEST=Ran the test on several boards in lab.
Change-Id: I9812da853013af6f9d435bd496d8aa8b0cef88b9
Reviewed-on: https://chromium-review.googlesource.com/1368492
Commit-Ready: Kalin Stoyanov <kalin@chromium.org>
Tested-by: Kalin Stoyanov <kalin@chromium.org>
Reviewed-by: Katherine Threlkeld <kathrelkeld@chromium.org>
(cherry picked from commit 65e0fb986e5dfc4fac1f310a084d294d6be29b04)
Reviewed-on: https://chromium-review.googlesource.com/c/1382803
Commit-Queue: Kalin Stoyanov <kalin@chromium.org>
diff --git a/client/site_tests/touch_UpdateErrors/control.stylus b/client/site_tests/touch_UpdateErrors/control.stylus
index 06a3f1c..f560b5f 100644
--- a/client/site_tests/touch_UpdateErrors/control.stylus
+++ b/client/site_tests/touch_UpdateErrors/control.stylus
@@ -14,7 +14,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
TEST_TYPE = "client"
-DEPENDENCIES = "stylus"
+DEPENDENCIES = "stylus, phase:PVT"
DOC = """
Search the touch update log entries for errors or failures.
diff --git a/client/site_tests/touch_UpdateErrors/control.touchpad b/client/site_tests/touch_UpdateErrors/control.touchpad
index 6f56f68..5179ae5 100644
--- a/client/site_tests/touch_UpdateErrors/control.touchpad
+++ b/client/site_tests/touch_UpdateErrors/control.touchpad
@@ -14,7 +14,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
TEST_TYPE = "client"
-DEPENDENCIES = "touchpad"
+DEPENDENCIES = "touchpad, phase:PVT"
DOC = """
Search the touch update log entries for errors or failures.
diff --git a/client/site_tests/touch_UpdateErrors/control.touchscreen b/client/site_tests/touch_UpdateErrors/control.touchscreen
index 33e20eb..29b5c82 100644
--- a/client/site_tests/touch_UpdateErrors/control.touchscreen
+++ b/client/site_tests/touch_UpdateErrors/control.touchscreen
@@ -14,7 +14,7 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "touch"
TEST_TYPE = "client"
-DEPENDENCIES = "touchscreen"
+DEPENDENCIES = "touchscreen, phase:PVT"
DOC = """
Search the touch update log entries for errors or failures.
diff --git a/client/site_tests/touch_UpdateErrors/touch_UpdateErrors.py b/client/site_tests/touch_UpdateErrors/touch_UpdateErrors.py
index 1e3fef1..e4d2ee8 100644
--- a/client/site_tests/touch_UpdateErrors/touch_UpdateErrors.py
+++ b/client/site_tests/touch_UpdateErrors/touch_UpdateErrors.py
@@ -93,11 +93,8 @@
start_line = self._find_logs_start_line()
log_cmd = 'tail -n +%s /var/log/messages | grep -i touch' % start_line
- pass_terms = ['touch-firmware-update']
- if hw_id == 'wacom': # Wacom styluses don't have Product ids.
- pass_terms.append(hw_id)
- else:
- pass_terms.append('"Product[^a-z0-9]ID[^a-z0-9]*%s"' % hw_id)
+ pass_terms = ['touch-firmware-update.*%s' % hw_id ]
+
fail_terms = ['error[^s]', 'err[^a-z]']
ignore_terms = ['touchview','autotest']
