Skip to content

GitLab

T
tangled
Commit 118c458f authored by xians@chromium.org's avatar xians@chromium.org
Browse files
Options

Remove the un-needed duplicated tests for kDisableAudioTrackProcessing. 

The fact is that the code behind kDisableAudioTrackProcessing is deprecating, and these tests are run two times now, one with kDisableAudioTrackProcessing, one without. This generates noise when tests are flaky on Android.

NOTRY=true

BUG=387895
TEST=bots.

Review URL: https://codereview.chromium.org/397023002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283700 0039d316-1c4b-4281-b951-d872f2087c98
parent d240aba4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 102 deletions
chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc
View file @ 118c458f
......@@ -82,8 +82,7 @@ static const char kMainWebrtcTestHtmlPage[] =
// 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
// the recording.
class WebRtcAudioQualityBrowserTest : public WebRtcTestBase,
public testing::WithParamInterface<bool> {
class WebRtcAudioQualityBrowserTest : public WebRtcTestBase {
public:
WebRtcAudioQualityBrowserTest() {}
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
......@@ -97,10 +96,6 @@ class WebRtcAudioQualityBrowserTest : public WebRtcTestBase,
switches::kUseFakeDeviceForMediaStream));
EXPECT_FALSE(command_line->HasSwitch(
switches::kUseFakeUIForMediaStream));
bool enable_audio_track_processing = GetParam();
if (!enable_audio_track_processing)
command_line->AppendSwitch(switches::kDisableAudioTrackProcessing);
}
void AddAudioFile(const std::string& input_file_relative_url,
......@@ -335,11 +330,6 @@ bool RunPesq(const base::FilePath& reference_file,
return true;
}
static const bool kRunTestsWithFlag[] = { false, true };
INSTANTIATE_TEST_CASE_P(WebRtcAudioQualityBrowserTests,
WebRtcAudioQualityBrowserTest,
testing::ValuesIn(kRunTestsWithFlag));
#if defined(OS_LINUX) || defined(OS_WIN)
// Only implemented on Linux and Windows for now.
#define MAYBE_MANUAL_TestAudioQuality MANUAL_TestAudioQuality
......@@ -347,7 +337,7 @@ INSTANTIATE_TEST_CASE_P(WebRtcAudioQualityBrowserTests,
#define MAYBE_MANUAL_TestAudioQuality DISABLED_MANUAL_TestAudioQuality
#endif
IN_PROC_BROWSER_TEST_P(WebRtcAudioQualityBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcAudioQualityBrowserTest,
MAYBE_MANUAL_TestAudioQuality) {
if (OnWinXp()) {
LOG(ERROR) << "This test is not implemented for Windows XP.";
......
chrome/browser/media/chrome_webrtc_browsertest.cc
View file @ 118c458f
......@@ -22,8 +22,7 @@ static const char kMainWebrtcTestHtmlPage[] =
// Top-level integration test for WebRTC. It always uses fake devices; see
// WebRtcWebcamBrowserTest for a test that acquires any real webcam on the
// system.
class WebRtcBrowserTest : public WebRtcTestBase,
public testing::WithParamInterface<bool> {
class WebRtcBrowserTest : public WebRtcTestBase {
public:
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
DetectErrorsInJavaScript(); // Look for errors in our rather complex js.
......@@ -41,12 +40,7 @@ class WebRtcBrowserTest : public WebRtcTestBase,
}
};
static const bool kRunTestsWithFlag[] = { false, true };
INSTANTIATE_TEST_CASE_P(WebRtcBrowserTests,
WebRtcBrowserTest,
testing::ValuesIn(kRunTestsWithFlag));
IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, RunsAudioVideoWebRTCCallInTwoTabs) {
IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, RunsAudioVideoWebRTCCallInTwoTabs) {
if (OnWinXp()) return;
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -71,7 +65,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, RunsAudioVideoWebRTCCallInTwoTabs) {
HangUp(right_tab);
}
IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, TestWebAudioMediaStream) {
IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, TestWebAudioMediaStream) {
// This tests against crash regressions for the WebAudio-MediaStream
// integration.
if (OnWinXp()) return;
......
content/browser/media/webrtc_browsertest.cc
View file @ 118c458f
This diff is collapsed.
content/browser/media/webrtc_getusermedia_browsertest.cc
View file @ 118c458f
......@@ -75,20 +75,11 @@ std::string GenerateGetUserMediaWithOptionalSourceID(
namespace content {
class WebRtcGetUserMediaBrowserTest: public WebRtcContentBrowserTest,
public testing::WithParamInterface<bool> {
class WebRtcGetUserMediaBrowserTest: public WebRtcContentBrowserTest {
public:
WebRtcGetUserMediaBrowserTest() : trace_log_(NULL) {}
virtual ~WebRtcGetUserMediaBrowserTest() {}
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
WebRtcContentBrowserTest::SetUpCommandLine(command_line);
bool enable_audio_track_processing = GetParam();
if (!enable_audio_track_processing)
command_line->AppendSwitch(switches::kDisableAudioTrackProcessing);
}
void StartTracing() {
CHECK(trace_log_ == NULL) << "Can only can start tracing once";
trace_log_ = base::debug::TraceLog::GetInstance();
......@@ -242,15 +233,10 @@ class WebRtcGetUserMediaBrowserTest: public WebRtcContentBrowserTest,
scoped_refptr<MessageLoopRunner> message_loop_runner_;
};
static const bool kRunTestsWithFlag[] = { false, true };
INSTANTIATE_TEST_CASE_P(WebRtcGetUserMediaBrowserTests,
WebRtcGetUserMediaBrowserTest,
testing::ValuesIn(kRunTestsWithFlag));
// These tests will all make a getUserMedia call with different constraints and
// see that the success callback is called. If the error callback is called or
// none of the callbacks are called the tests will simply time out and fail.
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest, GetVideoStreamAndStop) {
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, GetVideoStreamAndStop) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
......@@ -260,7 +246,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest, GetVideoStreamAndStop) {
base::StringPrintf("%s({video: true});", kGetUserMediaAndStop));
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
RenderSameTrackMediastreamAndStop) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -272,7 +258,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
kRenderSameTrackMediastreamAndStop));
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
RenderClonedMediastreamAndStop) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -285,7 +271,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
kRenderClonedMediastreamAndStop));
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
kRenderClonedTrackMediastreamAndStop) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -297,7 +283,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
kRenderClonedTrackMediastreamAndStop));
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
kRenderDuplicatedMediastreamAndStop) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -316,7 +302,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
#define MAYBE_GetAudioAndVideoStreamAndStop GetAudioAndVideoStreamAndStop
#endif
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
MAYBE_GetAudioAndVideoStreamAndStop) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -327,7 +313,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
"%s({video: true, audio: true});", kGetUserMediaAndStop));
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
GetAudioAndVideoStreamAndClone) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -337,7 +323,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
ExecuteJavascriptAndWaitForOk("getUserMediaAndClone();");
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
RenderVideoTrackInMultipleTagsAndPause) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -349,7 +335,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
GetUserMediaWithMandatorySourceID) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -374,7 +360,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
}
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
GetUserMediaWithInvalidMandatorySourceID) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -407,7 +393,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
video_ids[0])));
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
GetUserMediaWithInvalidOptionalSourceID) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -440,7 +426,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
video_ids[0])));
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest, TwoGetUserMediaAndStop) {
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, TwoGetUserMediaAndStop) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
......@@ -450,7 +436,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest, TwoGetUserMediaAndStop) {
"twoGetUserMediaAndStop({video: true, audio: true});");
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
TwoGetUserMediaWithEqualConstraints) {
std::string constraints1 = "{video: true, audio: true}";
const std::string& constraints2 = constraints1;
......@@ -460,7 +446,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
expected_result);
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
TwoGetUserMediaWithSecondVideoCropped) {
std::string constraints1 = "{video: true}";
std::string constraints2 = "{video: {mandatory: {maxHeight: 360}}}";
......@@ -469,7 +455,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
expected_result);
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
TwoGetUserMediaWithFirstHdSecondVga) {
std::string constraints1 =
"{video: {mandatory: {minWidth:1280 , minHeight: 720}}}";
......@@ -480,7 +466,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
expected_result);
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
TwoGetUserMediaAndVerifyFrameRate) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -499,7 +485,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
ExecuteJavascriptAndWaitForOk(command);
}
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
GetUserMediaWithTooHighVideoConstraintsValues) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -523,7 +509,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
// in a simple local <video>, and for a couple of seconds, collect some
// performance traces from VideoCaptureController colorspace conversion and
// potential resizing.
IN_PROC_BROWSER_TEST_P(
IN_PROC_BROWSER_TEST_F(
WebRtcGetUserMediaBrowserTest,
TraceVideoCaptureControllerPerformanceDuringGetUserMedia) {
RunGetUserMediaAndCollectMeasures(
......@@ -533,7 +519,7 @@ IN_PROC_BROWSER_TEST_P(
}
// This test calls getUserMedia and checks for aspect ratio behavior.
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
TestGetUserMediaAspectRatio4To3) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -548,7 +534,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
}
// This test calls getUserMedia and checks for aspect ratio behavior.
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
TestGetUserMediaAspectRatio16To9) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......@@ -563,7 +549,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
}
// This test calls getUserMedia and checks for aspect ratio behavior.
IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
TestGetUserMediaAspectRatio1To1) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
......
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