Commit d888e096 authored by John Rummell's avatar John Rummell Committed by Commit Bot

Disable audio output for media browser_tests on Linux

Due to problems on some bots failing to start PulseAudio and causing
Chrome startup to hang, disabling audio output for media browser tests
on Linux to avoid the hang.

Bug: 986021,1023029,1026849,1035472,1049467
Test: modified browser_tests pass locally
Change-Id: I29a996ee627bc4a5b93e5b8d6227dd7801998d11
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2056760Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: John Rummell <jrummell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741613}
parent 889e4fd9
...@@ -30,6 +30,11 @@ void MediaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) { ...@@ -30,6 +30,11 @@ void MediaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
command_line->AppendSwitchASCII( command_line->AppendSwitchASCII(
switches::kAutoplayPolicy, switches::kAutoplayPolicy,
switches::autoplay::kNoUserGestureRequiredPolicy); switches::autoplay::kNoUserGestureRequiredPolicy);
#if defined(OS_LINUX)
// Due to problems with PulseAudio failing to start, use a fake audio
// stream. crbug.com/1047655#c70
command_line->AppendSwitch(switches::kDisableAudioOutput);
#endif
std::vector<base::Feature> enabled_features = { std::vector<base::Feature> enabled_features = {
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
...@@ -41,12 +46,6 @@ void MediaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) { ...@@ -41,12 +46,6 @@ void MediaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
// Disable fallback after decode error to avoid unexpected test pass on // Disable fallback after decode error to avoid unexpected test pass on
// the fallback path. // the fallback path.
media::kFallbackAfterDecodeError, media::kFallbackAfterDecodeError,
#if defined(OS_LINUX)
// Disable out of process audio on Linux due to process spawn
// failures. http://crbug.com/986021
features::kAudioServiceOutOfProcess,
#endif
}; };
scoped_feature_list_.InitWithFeatures(enabled_features, disabled_features); scoped_feature_list_.InitWithFeatures(enabled_features, disabled_features);
......
...@@ -35,6 +35,11 @@ void MediaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) { ...@@ -35,6 +35,11 @@ void MediaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
switches::kAutoplayPolicy, switches::kAutoplayPolicy,
switches::autoplay::kNoUserGestureRequiredPolicy); switches::autoplay::kNoUserGestureRequiredPolicy);
command_line->AppendSwitch(switches::kExposeInternalsForTesting); command_line->AppendSwitch(switches::kExposeInternalsForTesting);
#if defined(OS_LINUX)
// Due to problems with PulseAudio failing to start, use a fake audio
// stream. crbug.com/1047655#c70
command_line->AppendSwitch(switches::kDisableAudioOutput);
#endif
std::vector<base::Feature> enabled_features = { std::vector<base::Feature> enabled_features = {
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
...@@ -46,12 +51,6 @@ void MediaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) { ...@@ -46,12 +51,6 @@ void MediaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) {
// Disable fallback after decode error to avoid unexpected test pass on // Disable fallback after decode error to avoid unexpected test pass on
// the fallback path. // the fallback path.
media::kFallbackAfterDecodeError, media::kFallbackAfterDecodeError,
#if defined(OS_LINUX)
// Disable out of process audio on Linux due to process spawn
// failures. http://crbug.com/986021
features::kAudioServiceOutOfProcess,
#endif
}; };
scoped_feature_list_.InitWithFeatures(enabled_features, disabled_features); scoped_feature_list_.InitWithFeatures(enabled_features, disabled_features);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment