Commit 3e0fc572 authored by Marina Ciocea's avatar Marina Ciocea Committed by Commit Bot

Disable failing webrtc audio quality tests on Windows.

This CL leaves enabled the tests that pass:
- WebRtcAudioQualityBrowserTest.MANUAL_TestCallQualityWithAudioFromFakeDevice
- WebRtcAudioQualityBrowserTest.MANUAL_TestCallQualityWithAudioFromWebAudio

and disables failing tests:
- WebRtcAudioQualityBrowserTest.MANUAL_TestAutoGainIsOffWithAudioProcessingOff
- WebRtcAudioQualityBrowserTest.MANUAL_TestAutoGainControlOnLowAudio

Bug: 850936
Change-Id: Ib19073f01f0880cda81bd9900d2d07c354c71ae3


- NOTRY because these tests don't run by default on bots
- TBR because owners are OOO.

NOTRY=true
TBR=hbos@chromium.org

Change-Id: Ib19073f01f0880cda81bd9900d2d07c354c71ae3
Reviewed-on: https://chromium-review.googlesource.com/1158699Reviewed-by: default avatarMarina Ciocea <marinaciocea@chromium.org>
Commit-Queue: Marina Ciocea <marinaciocea@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579814}
parent c28b7a4b
...@@ -66,12 +66,6 @@ const int kMaxAgcSegmentDiffMs = ...@@ -66,12 +66,6 @@ const int kMaxAgcSegmentDiffMs =
200; 200;
#endif #endif
#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)
#define MAYBE_WebRtcAudioQualityBrowserTest WebRtcAudioQualityBrowserTest
#else
// Not implemented on Android, ChromeOS etc.
#define MAYBE_WebRtcAudioQualityBrowserTest DISABLED_WebRtcAudioQualityBrowserTest
#endif
} // namespace } // namespace
...@@ -134,9 +128,9 @@ const int kMaxAgcSegmentDiffMs = ...@@ -134,9 +128,9 @@ const int kMaxAgcSegmentDiffMs =
// 50 / 100 in level. Also go into the playback tab, right-click Speakers, // 50 / 100 in level. Also go into the playback tab, right-click Speakers,
// and set that level to 50 / 100. Otherwise you will get distortion in // and set that level to 50 / 100. Otherwise you will get distortion in
// the recording. // the recording.
class MAYBE_WebRtcAudioQualityBrowserTest : public WebRtcTestBase { class WebRtcAudioQualityBrowserTest : public WebRtcTestBase {
public: public:
MAYBE_WebRtcAudioQualityBrowserTest() {} WebRtcAudioQualityBrowserTest() {}
void SetUpInProcessBrowserTestFixture() override { void SetUpInProcessBrowserTestFixture() override {
DetectErrorsInJavaScript(); // Look for errors in our rather complex js. DetectErrorsInJavaScript(); // Look for errors in our rather complex js.
} }
...@@ -657,7 +651,7 @@ bool ForceMicrophoneVolumeTo100Percent() { ...@@ -657,7 +651,7 @@ bool ForceMicrophoneVolumeTo100Percent() {
// plenty of time. Similarly, the recording time should be enough to catch the // plenty of time. Similarly, the recording time should be enough to catch the
// whole reference file. If you then silence-trim the reference file and actual // whole reference file. If you then silence-trim the reference file and actual
// file, you should end up with two time-synchronized files. // file, you should end up with two time-synchronized files.
void MAYBE_WebRtcAudioQualityBrowserTest::SetupAndRecordAudioCall( void WebRtcAudioQualityBrowserTest::SetupAndRecordAudioCall(
const base::FilePath& recording, const base::FilePath& recording,
const std::string& constraints, const std::string& constraints,
const base::TimeDelta recording_time) { const base::TimeDelta recording_time) {
...@@ -688,7 +682,7 @@ void MAYBE_WebRtcAudioQualityBrowserTest::SetupAndRecordAudioCall( ...@@ -688,7 +682,7 @@ void MAYBE_WebRtcAudioQualityBrowserTest::SetupAndRecordAudioCall(
HangUp(left_tab); HangUp(left_tab);
} }
void MAYBE_WebRtcAudioQualityBrowserTest::TestWithFakeDeviceGetUserMedia( void WebRtcAudioQualityBrowserTest::TestWithFakeDeviceGetUserMedia(
const std::string& constraints, const std::string& constraints,
const std::string& perf_modifier) { const std::string& perf_modifier) {
if (OnWin8OrHigher()) { if (OnWin8OrHigher()) {
...@@ -706,14 +700,30 @@ void MAYBE_WebRtcAudioQualityBrowserTest::TestWithFakeDeviceGetUserMedia( ...@@ -706,14 +700,30 @@ void MAYBE_WebRtcAudioQualityBrowserTest::TestWithFakeDeviceGetUserMedia(
DeleteFileUnlessTestFailed(recording, false); DeleteFileUnlessTestFailed(recording, false);
} }
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest, #if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
MANUAL_TestCallQualityWithAudioFromFakeDevice) { #define MAYBE_MANUAL_TestCallQualityWithAudioFromFakeDevice \
MANUAL_TestCallQualityWithAudioFromFakeDevice
#else
// Not implemented on Android, ChromeOS etc.
#define MAYBE_MANUAL_TestCallQualityWithAudioFromFakeDevice \
DISABLED_MANUAL_TestCallQualityWithAudioFromFakeDevice
#endif
IN_PROC_BROWSER_TEST_F(WebRtcAudioQualityBrowserTest,
MAYBE_MANUAL_TestCallQualityWithAudioFromFakeDevice) {
base::ScopedAllowBlockingForTesting allow_blocking; base::ScopedAllowBlockingForTesting allow_blocking;
TestWithFakeDeviceGetUserMedia(kAudioOnlyCallConstraints, "_getusermedia"); TestWithFakeDeviceGetUserMedia(kAudioOnlyCallConstraints, "_getusermedia");
} }
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest, #if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
MANUAL_TestCallQualityWithAudioFromWebAudio) { #define MAYBE_MANUAL_TestCallQualityWithAudioFromWebAudio \
MANUAL_TestCallQualityWithAudioFromWebAudio
#else
// Not implemented on Android, ChromeOS etc.
#define MAYBE_MANUAL_TestCallQualityWithAudioFromWebAudio \
DISABLED_MANUAL_TestCallQualityWithAudioFromWebAudio
#endif
IN_PROC_BROWSER_TEST_F(WebRtcAudioQualityBrowserTest,
MAYBE_MANUAL_TestCallQualityWithAudioFromWebAudio) {
base::ScopedAllowBlockingForTesting allow_blocking; base::ScopedAllowBlockingForTesting allow_blocking;
if (OnWin8OrHigher()) { if (OnWin8OrHigher()) {
// http://crbug.com/379798. // http://crbug.com/379798.
...@@ -786,7 +796,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest, ...@@ -786,7 +796,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
* device currently supports, and we want to be able to compare directly. See * device currently supports, and we want to be able to compare directly. See
* http://crbug.com/421054. * http://crbug.com/421054.
*/ */
void MAYBE_WebRtcAudioQualityBrowserTest::TestAutoGainControl( void WebRtcAudioQualityBrowserTest::TestAutoGainControl(
const std::string& constraints, const std::string& constraints,
const std::string& perf_modifier) { const std::string& perf_modifier) {
if (OnWin8OrHigher()) { if (OnWin8OrHigher()) {
...@@ -823,9 +833,18 @@ void MAYBE_WebRtcAudioQualityBrowserTest::TestAutoGainControl( ...@@ -823,9 +833,18 @@ void MAYBE_WebRtcAudioQualityBrowserTest::TestAutoGainControl(
DeleteFileUnlessTestFailed(actual_files_dir, true); DeleteFileUnlessTestFailed(actual_files_dir, true);
} }
#if defined(OS_LINUX) || defined(OS_MACOSX)
#define MAYBE_MANUAL_TestAutoGainControlOnLowAudio \
MANUAL_TestAutoGainControlOnLowAudio
#else
// Not implemented on Android, ChromeOS etc. Temporary disabled on Windows
// (https://crbug.com/850936).
#define MAYBE_MANUAL_TestAutoGainControlOnLowAudio \
DISABLED_MANUAL_TestAutoGainControlOnLowAudio
#endif
// The AGC should apply non-zero gain here. // The AGC should apply non-zero gain here.
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcAudioQualityBrowserTest,
MANUAL_TestAutoGainControlOnLowAudio) { MAYBE_MANUAL_TestAutoGainControlOnLowAudio) {
base::ScopedAllowBlockingForTesting allow_blocking; base::ScopedAllowBlockingForTesting allow_blocking;
// Disables AEC, but leaves AGC on. // Disables AEC, but leaves AGC on.
const char* kAudioCallWithoutEchoCancellation = const char* kAudioCallWithoutEchoCancellation =
...@@ -834,9 +853,18 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest, ...@@ -834,9 +853,18 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
TestAutoGainControl(kAudioCallWithoutEchoCancellation, "_with_agc")); TestAutoGainControl(kAudioCallWithoutEchoCancellation, "_with_agc"));
} }
#if defined(OS_LINUX) || defined(OS_MACOSX)
#define MAYBE_MANUAL_TestAutoGainIsOffWithAudioProcessingOff \
MANUAL_TestAutoGainIsOffWithAudioProcessingOff
#else
// Not implemented on Android, ChromeOS etc. Temporary disabled on Windows
// (https://crbug.com/850936).
#define MAYBE_MANUAL_TestAutoGainIsOffWithAudioProcessingOff \
DISABLED_MANUAL_TestAutoGainIsOffWithAudioProcessingOff
#endif
// Since the AGC is off here there should be no gain at all. // Since the AGC is off here there should be no gain at all.
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcAudioQualityBrowserTest,
MANUAL_TestAutoGainIsOffWithAudioProcessingOff) { MAYBE_MANUAL_TestAutoGainIsOffWithAudioProcessingOff) {
base::ScopedAllowBlockingForTesting allow_blocking; base::ScopedAllowBlockingForTesting allow_blocking;
const char* kAudioCallWithoutAudioProcessing = const char* kAudioCallWithoutAudioProcessing =
"{audio: { mandatory: { echoCancellation: false } } }"; "{audio: { mandatory: { echoCancellation: false } } }";
......
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