commit 31b2226b9c4574dc8f6cc6262d211ef4a54e361a
author Katherine Threlkeld <kathrelkeld@chromium.org> Fri Nov 13 16:23:09 2015 -0800
committer ChromeOS bot <3su6n15k.default@developer.gserviceaccount.com> Thu Nov 19 23:15:45 2015 +0000
tree 82acf933012da6ef84b26aeec8fa8237651d422f
parent 3607f7b603a55f0e178d3a88e3eca7553d5dffad

[Autotest] touch_UpdateErrors: improved logs checking

The firmware updater changes mean lulu now prints "product_id"
instead of "product id".  Change the regex to handle both cases.

BUG=chromium:555176
TEST=passes on lulu now

Change-Id: Ieba1f41aae0d606ce9a34514d5d29cdb55572f1d
Previous-Reviewed-on: https://chromium-review.googlesource.com/312709
(cherry picked from commit b908dd3b87e5f57eea03ed983618a3a537538845)
Reviewed-on: https://chromium-review.googlesource.com/313297
Reviewed-by: Katherine Threlkeld <kathrelkeld@chromium.org>
Commit-Queue: Katherine Threlkeld <kathrelkeld@chromium.org>
Tested-by: Katherine Threlkeld <kathrelkeld@chromium.org>

client/site_tests/touch_UpdateErrors/touch_UpdateErrors.py

diff --git a/client/site_tests/touch_UpdateErrors/touch_UpdateErrors.py b/client/site_tests/touch_UpdateErrors/touch_UpdateErrors.py
index 99b3887..5c4afe1 100644
--- a/client/site_tests/touch_UpdateErrors/touch_UpdateErrors.py
+++ b/client/site_tests/touch_UpdateErrors/touch_UpdateErrors.py
@@ -73,8 +73,8 @@
         log_cmd = 'tail -n +%s /var/log/messages | grep -i touch' % start_line
 
         pass_terms = ['touch-firmware-update',
-                      '"Product ID[^a-z0-9]*%s"' % hw_id]
-        fail_terms = ['error:']
+                      '"Product[^a-z0-9]ID[^a-z0-9]*%s"' % hw_id]
+        fail_terms = ['error']
 
         # Check for key terms in touch logs.
         for term in pass_terms + fail_terms: