commit 0baeec49fb22b953d7541eb789019cd936df4493
author Mohammed Habibulla <moch@chromium.org> Thu Oct 16 14:38:51 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Oct 17 01:13:36 2014 +0000
tree 11d8be6de2e7ac622ff4c43f462a381ffb30ddd5
parent 2b236c746a0a191249e5501b4ea269ff0e6aa99f

Fix regular expression check for vendor name

Some vendor names might include a hyphen (e.g. Hewlett-Packard)

BUG=chrome-os-partner:33045
TEST=firmware_Mosys test on zako

Change-Id: I639fb5ef5359e15f4ecfca8d825aabf0e564a4d7
Reviewed-on: https://chromium-review.googlesource.com/223727
Reviewed-by: Yusuf Mohsinally <mohsinally@chromium.org>
Commit-Queue: Mohammed Habibulla <moch@chromium.org>
Tested-by: Mohammed Habibulla <moch@chromium.org>

server/site_tests/firmware_Mosys/firmware_Mosys.py

diff --git a/server/site_tests/firmware_Mosys/firmware_Mosys.py b/server/site_tests/firmware_Mosys/firmware_Mosys.py
index 5ef8615..c3ae0a7 100644
--- a/server/site_tests/firmware_Mosys/firmware_Mosys.py
+++ b/server/site_tests/firmware_Mosys/firmware_Mosys.py
@@ -147,7 +147,7 @@
         # Output will be GOOGLE until launch, see crosbug/p/29755
         command = 'mosys platform vendor'
         output = self.run_cmd(command)[0]
-        p = re.compile('^\w+$')
+        p = re.compile('^[-\w]+$')
         if not p.match(output):
             raise error.TestFail('output is not a string Expect GOOGLE'
                                  ' or name of maker.')