| Index: content/browser/media/webrtc_browsertest.cc
|
| diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc
|
| index 31deb443b8400f815f1f641ca50032718fa8ab0e..db7d86e703cc94a30670faf19c67db7199a4f2df 100644
|
| --- a/content/browser/media/webrtc_browsertest.cc
|
| +++ b/content/browser/media/webrtc_browsertest.cc
|
| @@ -45,10 +45,17 @@ std::string GenerateGetUserMediaCall(const char* function_name,
|
|
|
| namespace content {
|
|
|
| -class WebrtcBrowserTest: public ContentBrowserTest {
|
| +#if defined(OS_LINUX)
|
| +// All tests are flaky on Linux: crbug.com/281492.
|
| +#define MAYBE_WebrtcBrowserTest DISABLED_WebrtcBrowserTest
|
| +#else
|
| +#define MAYBE_WebrtcBrowserTest WebrtcBrowserTest
|
| +#endif
|
| +
|
| +class MAYBE_WebrtcBrowserTest: public ContentBrowserTest {
|
| public:
|
| - WebrtcBrowserTest() {}
|
| - virtual ~WebrtcBrowserTest() {}
|
| + MAYBE_WebrtcBrowserTest() {}
|
| + virtual ~MAYBE_WebrtcBrowserTest() {}
|
|
|
| virtual void SetUpOnMainThread() OVERRIDE {
|
| ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| @@ -82,7 +89,7 @@ class WebrtcBrowserTest: public ContentBrowserTest {
|
| // 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_F(WebrtcBrowserTest, GetVideoStreamAndStop) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest, GetVideoStreamAndStop) {
|
| GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
|
| NavigateToURL(shell(), url);
|
|
|
| @@ -91,7 +98,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetVideoStreamAndStop) {
|
| ExpectTitle("OK");
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetAudioAndVideoStreamAndStop) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest,
|
| + GetAudioAndVideoStreamAndStop) {
|
| GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
|
| NavigateToURL(shell(), url);
|
|
|
| @@ -100,7 +108,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetAudioAndVideoStreamAndStop) {
|
| ExpectTitle("OK");
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetAudioAndVideoStreamAndClone) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest,
|
| + GetAudioAndVideoStreamAndClone) {
|
| GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
|
| NavigateToURL(shell(), url);
|
|
|
| @@ -119,7 +128,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetAudioAndVideoStreamAndClone) {
|
|
|
| // These tests will make a complete PeerConnection-based call and verify that
|
| // video is playing for the call.
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupVideoCall) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest, MAYBE_CanSetupVideoCall) {
|
| GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
|
| NavigateToURL(shell(), url);
|
|
|
| @@ -134,7 +143,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupVideoCall) {
|
| #define MAYBE_CanSetupAudioAndVideoCall CanSetupAudioAndVideoCall
|
| #endif
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest,
|
| + MAYBE_CanSetupAudioAndVideoCall) {
|
| GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
|
| NavigateToURL(shell(), url);
|
|
|
| @@ -142,7 +152,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) {
|
| ExpectTitle("OK");
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest,
|
| + MANUAL_CanSetupCallAndSendDtmf) {
|
| GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
|
| NavigateToURL(shell(), url);
|
|
|
| @@ -150,7 +161,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) {
|
| ExecuteJavascript("callAndSendDtmf('123,abc');"));
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest,
|
| CanMakeEmptyCallThenAddStreamsAndRenegotiate) {
|
| GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
|
| NavigateToURL(shell(), url);
|
| @@ -177,7 +188,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
|
| #define MAYBE_CanSetupAudioAndVideoCallWithoutMsidAndBundle\
|
| CanSetupAudioAndVideoCallWithoutMsidAndBundle
|
| #endif
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest,
|
| MAYBE_CanSetupAudioAndVideoCallWithoutMsidAndBundle) {
|
| GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
|
| NavigateToURL(shell(), url);
|
| @@ -188,7 +199,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
|
|
|
| // This test will make a PeerConnection-based call and test an unreliable text
|
| // dataChannel.
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataOnly) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest, CallWithDataOnly) {
|
| GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
|
| NavigateToURL(shell(), url);
|
|
|
| @@ -205,7 +216,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataOnly) {
|
|
|
| // This test will make a PeerConnection-based call and test an unreliable text
|
| // dataChannel and audio and video tracks.
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithDataAndMedia) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest, MAYBE_CallWithDataAndMedia) {
|
| GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
|
| NavigateToURL(shell(), url);
|
|
|
| @@ -222,7 +233,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithDataAndMedia) {
|
|
|
| // This test will make a PeerConnection-based call and test an unreliable text
|
| // dataChannel and later add an audio and video track.
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithDataAndLaterAddMedia) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest,
|
| + MAYBE_CallWithDataAndLaterAddMedia) {
|
| GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
|
| NavigateToURL(shell(), url);
|
|
|
| @@ -240,7 +252,8 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithDataAndLaterAddMedia) {
|
| // This test will make a PeerConnection-based call and send a new Video
|
| // MediaStream that has been created based on a MediaStream created with
|
| // getUserMedia.
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithNewVideoMediaStream) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest,
|
| + MAYBE_CallWithNewVideoMediaStream) {
|
| GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
|
| NavigateToURL(shell(), url);
|
|
|
| @@ -254,7 +267,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithNewVideoMediaStream) {
|
| // AudioTrack is added instead.
|
| // TODO(phoglund): This test is manual since not all buildbots has an audio
|
| // input.
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CallAndModifyStream) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest, MANUAL_CallAndModifyStream) {
|
| GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
|
| NavigateToURL(shell(), url);
|
|
|
| @@ -264,7 +277,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CallAndModifyStream) {
|
| }
|
|
|
| // This test calls getUserMedia in sequence with different constraints.
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, TestGetUserMediaConstraints) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest, TestGetUserMediaConstraints) {
|
| GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
|
|
|
| std::vector<std::string> list_of_get_user_media_calls;
|
| @@ -295,7 +308,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, TestGetUserMediaConstraints) {
|
| }
|
|
|
| // This test calls getUserMedia and checks for aspect ratio behavior.
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, TestGetUserMediaAspectRatio) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest, TestGetUserMediaAspectRatio) {
|
| GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
|
|
|
| std::string constraints_4_3 = GenerateGetUserMediaCall(
|
| @@ -314,7 +327,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, TestGetUserMediaAspectRatio) {
|
| ExpectTitle("16:9 letterbox");
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, AddTwoMediaStreamsToOnePC) {
|
| +IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcBrowserTest, AddTwoMediaStreamsToOnePC) {
|
| GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
|
| NavigateToURL(shell(), url);
|
|
|
|
|