[autotest] Recognize nyan_blaze-freon for servo board conversion.
Recognize "-freon" in servo_afe_board_map, so that the build name
"nyan_blaze-freon" will be recognized as servo board "nyan_blaze".
Update the unit tests to prove that it's true.
BUG=chromium:478339
TEST=unit tests
Change-Id: Iaad79a1e633b6493d8b71a7c84ced0018b20b9a3
Reviewed-on: https://chromium-review.googlesource.com/349211
Commit-Ready: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Kevin Cheng <kevcheng@chromium.org>
diff --git a/client/common_lib/cros/servo_afe_board_map.py b/client/common_lib/cros/servo_afe_board_map.py
index 53678bb..7764dd1 100644
--- a/client/common_lib/cros/servo_afe_board_map.py
+++ b/client/common_lib/cros/servo_afe_board_map.py
@@ -15,7 +15,7 @@
@return board we expect servo to have.
"""
- KNOWN_SUFFIXES = ['_freon', '_moblab', '-cheets']
+ KNOWN_SUFFIXES = ['-freon', '_freon', '_moblab', '-cheets']
BOARD_MAP = {'gizmo': 'panther'}
mapped_board = afe_board
if afe_board in BOARD_MAP:
diff --git a/client/common_lib/cros/servo_afe_board_map_unittest.py b/client/common_lib/cros/servo_afe_board_map_unittest.py
index e645d48..18576e0 100755
--- a/client/common_lib/cros/servo_afe_board_map_unittest.py
+++ b/client/common_lib/cros/servo_afe_board_map_unittest.py
@@ -19,6 +19,7 @@
self.assertEqual(afe_map('kip'), 'kip')
self.assertEqual(afe_map('gizmo'), 'panther')
self.assertEqual(afe_map('link_freon'), 'link')
+ self.assertEqual(afe_map('nyan_blaze-freon'), 'nyan_blaze')
self.assertEqual(afe_map('stumpy_moblab'), 'stumpy')
self.assertEqual(afe_map('veyron_minnie-cheets'), 'veyron_minnie')