commit 639fa946020ad03eddaf76d7d5a339de7e37e753
author Hirokazu Honda <hiroh@chromium.org> Tue Feb 20 13:02:47 2018 +0900
committer chrome-bot <chrome-bot@chromium.org> Tue Feb 20 01:52:14 2018 -0800
tree 12a7ca5f149b3d782e6df343b2609f60b7cc7af6
parent 2d1f510d51f173d437c450484cc470077ffa5bd3

autotest-capability: Fix regular expression for label in DeviceCapability

Fix regurar expression to go along with '-' contained labels (e.g. hw_dec_vp9-2_1080_30)

BUG=chromium:789866
TEST=video_VideoCapability on eve

Change-Id: I79b997839a41e3ad75300d9497a57acdd51733ac
Reviewed-on: https://chromium-review.googlesource.com/925868
Commit-Ready: Hirokazu Honda <hiroh@chromium.org>
Tested-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>

client/cros/video/device_capability.py

diff --git a/client/cros/video/device_capability.py b/client/cros/video/device_capability.py
index cece6f2..70a94c9 100644
--- a/client/cros/video/device_capability.py
+++ b/client/cros/video/device_capability.py
@@ -89,7 +89,7 @@
                     caps = [rule]
 
                 for capability in caps:
-                    m = re.match(r'(?:(disable|no)\s+)?(\w+)$', capability)
+                    m = re.match(r'(?:(disable|no)\s+)?([\w|\-]+)$', capability)
                     prefix, capability = m.groups()
                     if capability in managed_caps:
                         autotest_caps[capability] = prefix or 'yes'