brillo: Fix control files.android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-iot-releasenougat-dr1-releasenougat-devn-iot-preview-4

Fix control files to work with the interactive testing framework.

BUG=none
TEST=test_droid.py suite:brillo-audio passes

Change-Id: Ifc6e243f48bfb1a434385d4570ea916efb56a73a
Reviewed-on: https://chromium-review.googlesource.com/325825
Commit-Ready: Ralph Nathan <ralphnathan@chromium.org>
Tested-by: Ralph Nathan <ralphnathan@chromium.org>
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Simran Basi <sbasi@chromium.org>

2 files changed, 7 insertions, 2 deletions

diff --git a/server/site_tests/brillo_PlaybackAudioTest/control.opensles.file b/server/site_tests/brillo_PlaybackAudioTest/control.opensles.file
index fa19bec83d..6a80a2b58d 100644
--- a/server/site_tests/brillo_PlaybackAudioTest/control.opensles.file
+++ b/server/site_tests/brillo_PlaybackAudioTest/control.opensles.file
@@ -22,6 +22,9 @@ Test arguments:
     feedback=NAME  Name of the feedback client implementation to use. See
                    server.brillo.feedback.client_factory for supported values.
                    Default: 'loop'.
+
+    feedback_args  Comma-separated list of initialization arguments for the
+                   feedback client. Default: no additional arguments.
 """
 
 TEST_ARG_NAMES = ()
@@ -32,7 +35,8 @@ def run(machine):
     test_args = {name: args_dict[name] for name in TEST_ARG_NAMES
                  if name in args_dict}
     fb_client_name = args_dict.get('feedback', 'loop')
-    fb_client = client_factory.get_audio_client(fb_client_name)
+    fb_client = client_factory.get_audio_client(fb_client_name, NAME, machine,
+                                                args_dict.get('feedback_args'))
     job.run_test('brillo_PlaybackAudioTest',
                  host=hosts.create_host(machine),
                  fb_client=fb_client,
diff --git a/server/site_tests/brillo_RecordingAudioTest/control.libmedia.stereo b/server/site_tests/brillo_RecordingAudioTest/control.libmedia.stereo
index af9a247ff1..af358d07d5 100644
--- a/server/site_tests/brillo_RecordingAudioTest/control.libmedia.stereo
+++ b/server/site_tests/brillo_RecordingAudioTest/control.libmedia.stereo
@@ -35,7 +35,8 @@ def run(machine):
     test_args = {name: args_dict[name] for name in TEST_ARG_NAMES
                  if name in args_dict}
     fb_client_name = args_dict.get('feedback', 'loop')
-    fb_client = client_factory.get_audio_client(fb_client_name)
+    fb_client = client_factory.get_audio_client(fb_client_name, NAME, machine,
+                                                args_dict.get('feedback_args'))
     job.run_test('brillo_RecordingAudioTest',
                  host=hosts.create_host(machine),
                  fb_client=fb_client,