commit d2fe0b4776b9211a37c604c854adedf7a066cde3
author Cheng-Yi Chiang <cychiang@chromium.org> Wed Sep 23 11:47:58 2015 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed Sep 23 23:01:29 2015 -0700
tree 4e12bc072337ccfb8bbe431eee3088a4851c17d6
parent cec47568ff62ac5db3b5557f0995e4591c971ab8

[autotest] audio_InternalCardNodes: Fix nodes for link and samus

Link has keyboar mic, and samus has AOKR mic.

BUG=chromium:535244
TEST=run audio_internalCardNodes test on link and samus

Change-Id: I74b8cb38d89e6167c8934118d01c577cffaa91ea
Reviewed-on: https://chromium-review.googlesource.com/301799
Commit-Ready: Cheng-Yi Chiang <cychiang@chromium.org>
Tested-by: Cheng-Yi Chiang <cychiang@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@chromium.org>

client/cros/audio/cras_utils.py

diff --git a/client/cros/audio/cras_utils.py b/client/cros/audio/cras_utils.py
index a307e24..4133ca7 100644
--- a/client/cros/audio/cras_utils.py
+++ b/client/cros/audio/cras_utils.py
@@ -271,7 +271,8 @@
 CRAS_OUTPUT_NODE_TYPES = ['HEADPHONE', 'INTERNAL_SPEAKER', 'HDMI', 'USB',
                           'BLUETOOTH', 'UNKNOWN']
 CRAS_INPUT_NODE_TYPES = ['MIC', 'INTERNAL_MIC', 'USB', 'BLUETOOTH',
-                         'POST_DSP_LOOPBACK', 'POST_MIX_LOOPBACK', 'UNKNOWN']
+                         'POST_DSP_LOOPBACK', 'POST_MIX_LOOPBACK', 'UNKNOWN',
+                         'KEYBOARD_MIC', 'AOKR']
 CRAS_NODE_TYPES = CRAS_OUTPUT_NODE_TYPES + CRAS_INPUT_NODE_TYPES
 
 

server/site_tests/audio_InternalCardNodes/audio_InternalCardNodes.py

diff --git a/server/site_tests/audio_InternalCardNodes/audio_InternalCardNodes.py b/server/site_tests/audio_InternalCardNodes/audio_InternalCardNodes.py
index 388e5a5..53b9fb4 100644
--- a/server/site_tests/audio_InternalCardNodes/audio_InternalCardNodes.py
+++ b/server/site_tests/audio_InternalCardNodes/audio_InternalCardNodes.py
@@ -45,6 +45,17 @@
                 ['INTERNAL_MIC', 'MIC', 'POST_DSP_LOOPBACK',
                  'POST_MIX_LOOPBACK'])
 
+        # Modify expected nodes for special boards.
+        board_name = host.get_board().split(':')[1]
+
+        if board_name == 'link':
+            expected_plugged_nodes_without_audio_jack[1].append('KEYBOARD_MIC')
+            expected_plugged_nodes_with_audio_jack[1].append('KEYBOARD_MIC')
+
+        if board_name == 'samus':
+            expected_plugged_nodes_without_audio_jack[1].append('AOKR')
+            expected_plugged_nodes_with_audio_jack[1].append('AOKR')
+
         audio_test_utils.check_plugged_nodes(
                 audio_facade, expected_plugged_nodes_without_audio_jack)