Exclude seven boards from running USB audio tests.

BUG=b:233963215
TEST=ran with test_that

Change-Id: Ia9ceeb8ad7ecef6aa42d1be881657330ae893460
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3670579
Tested-by: Kalin Stoyanov <kalin@chromium.org>
Reviewed-by: Yu-Hsuan Hsu <yuhsuan@chromium.org>
Commit-Queue: Kalin Stoyanov <kalin@chromium.org>
Auto-Submit: Kalin Stoyanov <kalin@chromium.org>

9 files changed, 40 insertions, 9 deletions

diff --git a/server/site_tests/audio_AudioBasicUSBPlayback/audio_AudioBasicUSBPlayback.py b/server/site_tests/audio_AudioBasicUSBPlayback/audio_AudioBasicUSBPlayback.py
index 704dda08c7..12aa2cb286 100644
--- a/server/site_tests/audio_AudioBasicUSBPlayback/audio_AudioBasicUSBPlayback.py
+++ b/server/site_tests/audio_AudioBasicUSBPlayback/audio_AudioBasicUSBPlayback.py
@@ -13,6 +13,7 @@ from autotest_lib.client.cros.chameleon import audio_test_utils
 from autotest_lib.client.cros.chameleon import chameleon_audio_ids
 from autotest_lib.client.cros.chameleon import chameleon_audio_helper
 from autotest_lib.server.cros.audio import audio_test
+from autotest_lib.client.common_lib import error
 
 
 class audio_AudioBasicUSBPlayback(audio_test.AudioTest):
@@ -25,13 +26,16 @@ class audio_AudioBasicUSBPlayback(audio_test.AudioTest):
     version = 1
     RECORD_SECONDS = 5
 
-    def run_once(self, suspend=False):
+    def run_once(self, suspend=False, blocked_boards=[]):
         """Runs Basic Audio USB playback test.
 
         @param suspend: True for suspend the device before playback.
                         False for not suspend.
 
         """
+        if self.host.get_board().split(':')[1] in blocked_boards:
+            raise error.TestNAError('Board pending fix for b/233962403!')
+
         golden_file = audio_test_data.GenerateAudioTestData(
                 path=os.path.join(self.bindir, 'fix_1k_440_16.wav'),
                 duration_secs=6,
diff --git a/server/site_tests/audio_AudioBasicUSBPlayback/control b/server/site_tests/audio_AudioBasicUSBPlayback/control
index 275e46d4ea..614ea39535 100644
--- a/server/site_tests/audio_AudioBasicUSBPlayback/control
+++ b/server/site_tests/audio_AudioBasicUSBPlayback/control
@@ -26,6 +26,9 @@ chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
 
 def run(machine):
     host = hosts.create_host(machine, chameleon_args=chameleon_args)
-    job.run_test("audio_AudioBasicUSBPlayback", host=host)
+    job.run_test("audio_AudioBasicUSBPlayback", host=host,
+                 blocked_boards=['asurada',    # Pending fix for b/233962403
+                                 'cherry', 'elm', 'elm-kernelnext', 'grunt',
+                                 'jacuzzi', 'kukui'])
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/audio_AudioBasicUSBPlayback/control.suspend b/server/site_tests/audio_AudioBasicUSBPlayback/control.suspend
index aa92cdbba6..1ab7a4442f 100644
--- a/server/site_tests/audio_AudioBasicUSBPlayback/control.suspend
+++ b/server/site_tests/audio_AudioBasicUSBPlayback/control.suspend
@@ -27,6 +27,9 @@ chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
 def run(machine):
     host = hosts.create_host(machine, chameleon_args=chameleon_args)
     job.run_test("audio_AudioBasicUSBPlayback", host=host, suspend=True,
-                 tag="suspend")
+                 tag="suspend",
+                 blocked_boards=['asurada',    # Pending fix for b/233962403
+                                 'cherry', 'elm', 'elm-kernelnext', 'grunt',
+                                 'jacuzzi', 'kukui'])
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/audio_AudioBasicUSBPlaybackRecord/audio_AudioBasicUSBPlaybackRecord.py b/server/site_tests/audio_AudioBasicUSBPlaybackRecord/audio_AudioBasicUSBPlaybackRecord.py
index 1a7985d336..85fbafe3ad 100644
--- a/server/site_tests/audio_AudioBasicUSBPlaybackRecord/audio_AudioBasicUSBPlaybackRecord.py
+++ b/server/site_tests/audio_AudioBasicUSBPlaybackRecord/audio_AudioBasicUSBPlaybackRecord.py
@@ -16,6 +16,7 @@ from autotest_lib.client.cros.chameleon import audio_test_utils
 from autotest_lib.client.cros.chameleon import chameleon_audio_ids
 from autotest_lib.client.cros.chameleon import chameleon_audio_helper
 from autotest_lib.server.cros.audio import audio_test
+from autotest_lib.client.common_lib import error
 
 
 class audio_AudioBasicUSBPlaybackRecord(audio_test.AudioTest):
@@ -28,13 +29,16 @@ class audio_AudioBasicUSBPlaybackRecord(audio_test.AudioTest):
     version = 1
     RECORD_SECONDS = 5
 
-    def run_once(self, suspend=False):
+    def run_once(self, suspend=False, blocked_boards=[]):
         """Runs Basic Audio USB playback/record test.
 
         @param suspend: True for suspend the device before playback/record.
                         False for not suspend.
 
         """
+        if self.host.get_board().split(':')[1] in blocked_boards:
+            raise error.TestNAError('Board pending fix for b/233962403!')
+
         golden_file = audio_test_data.GenerateAudioTestData(
                 path=os.path.join(self.bindir, 'fix_1k_440_16.wav'),
                 duration_secs=6,
diff --git a/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control b/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control
index a03c22d736..89fc987dd6 100644
--- a/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control
+++ b/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control
@@ -26,6 +26,9 @@ chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
 
 def run(machine):
     host = hosts.create_host(machine, chameleon_args=chameleon_args)
-    job.run_test("audio_AudioBasicUSBPlaybackRecord", host=host)
+    job.run_test("audio_AudioBasicUSBPlaybackRecord", host=host,
+                 blocked_boards=['asurada',    # Pending fix for b/233962403
+                                 'cherry', 'elm', 'elm-kernelnext', 'grunt',
+                                 'jacuzzi', 'kukui'])
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control.suspend b/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control.suspend
index 5ceb48c3a2..c57cdec042 100644
--- a/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control.suspend
+++ b/server/site_tests/audio_AudioBasicUSBPlaybackRecord/control.suspend
@@ -27,6 +27,9 @@ chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
 def run(machine):
     host = hosts.create_host(machine, chameleon_args=chameleon_args)
     job.run_test("audio_AudioBasicUSBPlaybackRecord", host=host, suspend=True,
-                 tag="suspend")
+                 tag="suspend",
+                 blocked_boards=['asurada',    # Pending fix for b/233962403
+                                 'cherry', 'elm', 'elm-kernelnext', 'grunt',
+                                 'jacuzzi', 'kukui'])
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/audio_AudioBasicUSBRecord/audio_AudioBasicUSBRecord.py b/server/site_tests/audio_AudioBasicUSBRecord/audio_AudioBasicUSBRecord.py
index 6fad6acd45..9f41bea716 100644
--- a/server/site_tests/audio_AudioBasicUSBRecord/audio_AudioBasicUSBRecord.py
+++ b/server/site_tests/audio_AudioBasicUSBRecord/audio_AudioBasicUSBRecord.py
@@ -13,6 +13,7 @@ from autotest_lib.client.cros.chameleon import audio_test_utils
 from autotest_lib.client.cros.chameleon import chameleon_audio_helper
 from autotest_lib.client.cros.chameleon import chameleon_audio_ids
 from autotest_lib.server.cros.audio import audio_test
+from autotest_lib.client.common_lib import error
 
 
 class audio_AudioBasicUSBRecord(audio_test.AudioTest):
@@ -25,13 +26,17 @@ class audio_AudioBasicUSBRecord(audio_test.AudioTest):
     version = 1
     RECORD_SECONDS = 5
 
-    def run_once(self, suspend=False):
+    def run_once(self, suspend=False, blocked_boards=[]):
         """Runs Basic Audio USB recording test.
 
         @param suspend: True for suspend the device before recording.
                         False for not suspend.
 
         """
+
+        if self.host.get_board().split(':')[1] in blocked_boards:
+            raise error.TestNAError('Board pending fix for b/233962403!')
+
         golden_file = audio_test_data.GenerateAudioTestData(
                 path=os.path.join(self.bindir, 'fix_1k_440_16.wav'),
                 duration_secs=6,
diff --git a/server/site_tests/audio_AudioBasicUSBRecord/control b/server/site_tests/audio_AudioBasicUSBRecord/control
index cc9e8769ef..9c9a89f0e7 100644
--- a/server/site_tests/audio_AudioBasicUSBRecord/control
+++ b/server/site_tests/audio_AudioBasicUSBRecord/control
@@ -26,6 +26,9 @@ chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
 
 def run(machine):
     host = hosts.create_host(machine, chameleon_args=chameleon_args)
-    job.run_test("audio_AudioBasicUSBRecord", host=host)
+    job.run_test("audio_AudioBasicUSBRecord", host=host,
+                 blocked_boards=['asurada',    # Pending fix for b/233962403
+                                 'cherry', 'elm', 'elm-kernelnext', 'grunt',
+                                 'jacuzzi', 'kukui'])
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/audio_AudioBasicUSBRecord/control.suspend b/server/site_tests/audio_AudioBasicUSBRecord/control.suspend
index 41d8fd1a57..132237675a 100644
--- a/server/site_tests/audio_AudioBasicUSBRecord/control.suspend
+++ b/server/site_tests/audio_AudioBasicUSBRecord/control.suspend
@@ -27,6 +27,9 @@ chameleon_args = hosts.CrosHost.get_chameleon_arguments(args_dict)
 def run(machine):
     host = hosts.create_host(machine, chameleon_args=chameleon_args)
     job.run_test("audio_AudioBasicUSBRecord", host=host, suspend=True,
-                 tag="suspend")
+                 tag="suspend",
+                 blocked_boards=['asurada',    # Pending fix for b/233962403
+                                 'cherry', 'elm', 'elm-kernelnext', 'grunt',
+                                 'jacuzzi', 'kukui'])
 
 parallel_simple(run, machines)