Fixing a syntax error in desktopui_AudioFeedback disabling it from bvt. Using an IP address instead of localhost due to dns resolution problem in the lab.
TEST=None
BUG=None
Change-Id: I2d1075fb77724e4bfe6318eedca27f1f820c544f
Reviewed-on: https://gerrit.chromium.org/gerrit/13964
Reviewed-by: Nirnimesh <nirnimesh@chromium.org>
Commit-Ready: Rohit Makasana <rohitbm@chromium.org>
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
Tested-by: Rohit Makasana <rohitbm@chromium.org>
diff --git a/client/site_tests/desktopui_AudioFeedback/desktopui_AudioFeedback.py b/client/site_tests/desktopui_AudioFeedback/desktopui_AudioFeedback.py
index 367b650..095630d 100644
--- a/client/site_tests/desktopui_AudioFeedback/desktopui_AudioFeedback.py
+++ b/client/site_tests/desktopui_AudioFeedback/desktopui_AudioFeedback.py
@@ -100,7 +100,7 @@
'%s is not an executable' % self._sox_path)
super(desktopui_AudioFeedback, self).initialize()
- self._test_url = 'http://localhost:8000/youtube.html'
+ self._test_url = 'http://127.0.0.1:8000/youtube.html'
self._testServer = httpd.HTTPListener(8000, docroot=self.bindir)
self._testServer.run()
@@ -177,7 +177,11 @@
# Speaker control settings may differ from device to device.
if self.pyauto.ChromeOSBoard() in _CONTROL_SPEAKER_DEVICE:
- self._mixer_settings.append({'name': _CONTROL_SPEAKER, 'value': "0%"})
+ self._mixer_settings.append({'name': _CONTROL_SPEAKER,
+ 'value': "0%"})
+ else: # TODO(rohitbm) : Create a private file for 'HP/Speakers' devices.
+ self._mixer_settings.append({'name': _CONTROL_SPEAKER_SL,
+ 'value': "0%"})
for item in self._mixer_settings:
logging.info('Setting %s to %s on card %s' %
@@ -230,7 +234,7 @@
if rms_val < self._sox_min_rms:
raise error.TestError(
'RMS value %f too low. Minimum threshold is %f.' %
- rms_val, self._sox_min_rms)
+ (rms_val, self._sox_min_rms))
def noise_reduce_file(self, test_file, noise_file):
"""Runs the sox command to reduce the noise.
diff --git a/client/site_tests/desktopui_FlashSanityCheck/desktopui_FlashSanityCheck.py b/client/site_tests/desktopui_FlashSanityCheck/desktopui_FlashSanityCheck.py
index 6fe2043..83a35ca 100644
--- a/client/site_tests/desktopui_FlashSanityCheck/desktopui_FlashSanityCheck.py
+++ b/client/site_tests/desktopui_FlashSanityCheck/desktopui_FlashSanityCheck.py
@@ -11,7 +11,7 @@
version = 3
def initialize(self):
- self._test_url = 'http://localhost:8000/index.html'
+ self._test_url = 'http://127.0.0.1:8000/index.html'
self._testServer = httpd.HTTPListener(8000, docroot=self.srcdir)
self._testServer.run()
super(desktopui_FlashSanityCheck, self).initialize()
diff --git a/server/site_tests/suites/control.audio b/server/site_tests/suites/control.audio
new file mode 100644
index 0000000..547fcd2
--- /dev/null
+++ b/server/site_tests/suites/control.audio
@@ -0,0 +1,21 @@
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTHOR = "Chrome OS Team"
+NAME = "Audio"
+TIME = "SHORT"
+TEST_CATEGORY = "Functional"
+TEST_CLASS = "suite"
+TEST_TYPE = "server"
+
+DOC = """
+This test suite runs automated audio feedback tests that verify audio out
+functionality.
+"""
+
+TESTS = [
+ ('desktopui_AudioFeedback', {}),
+]
+
+job.distribute_across_machines(TESTS, machines)
diff --git a/server/site_tests/suites/control.bvt b/server/site_tests/suites/control.bvt
index a3dc14b..240fa23 100644
--- a/server/site_tests/suites/control.bvt
+++ b/server/site_tests/suites/control.bvt
@@ -25,7 +25,6 @@
('platform_RootPartitionsNotMounted', {}),
('platform_ToolchainOptions', {}),
('build_RootFilesystemSize', {}),
- ('desktopui_AudioFeedback', {}),
# crosbug.com/20024
# ('desktopui_ChromeFirstRender', {}),
('desktopui_UrlFetch', {'live': False, 'tag': 'not-live'}),