generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disabling two flaky tests in libjingle_media_unittest.

Browse Source 
BUG=4452,4453
R=kjellander@webrtc.org
TBR=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/44739004

Cr-Commit-Position: refs/heads/master@{#8791}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8791 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tina.legrand@webrtc.org 2015-03-19 13:27:50 +00:00
parent 17c64d1c96
commit 0c26299739
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
talk/media/sctp/sctpdataengine_unittest.cc
View File

@ -486,7 +486,13 @@ TEST_F(SctpDataMediaChannelTest, ClosesStreamsOnBothSides) {
EXPECT_TRUE_WAIT(chan_1_sig_receiver.WasStreamClosed(4), 1000); EXPECT_TRUE_WAIT(chan_1_sig_receiver.WasStreamClosed(4), 1000);
} }
TEST_F(SctpDataMediaChannelTest, ReusesAStream) { // Flaky on Linux and Windows. See webrtc:4453.
#if defined(WEBRTC_WIN) || defined(WEBRTC_LINUX)
#define MAYBE_ReusesAStream DISABLED_ReusesAStream
#else
#define MAYBE_ReusesAStream ReusesAStream
#endif
TEST_F(SctpDataMediaChannelTest, MAYBE_ReusesAStream) {
// Shut down channel 1, then open it up again for reuse. // Shut down channel 1, then open it up again for reuse.
SetupConnectedChannels(); SetupConnectedChannels();
cricket::SendDataResult result; cricket::SendDataResult result;

8
talk/media/webrtc/webrtcvideoengine_unittest.cc
View File

@ -2490,7 +2490,13 @@ TEST_F(WebRtcVideoMediaChannelTest, AddRemoveRecvStreams) {
Base::AddRemoveRecvStreams(); Base::AddRemoveRecvStreams();
} }
TEST_F(WebRtcVideoMediaChannelTest, AddRemoveRecvStreamAndRender) { // Flaky on Linux only. See webrtc:4452.
#if defined(WEBRTC_LINUX)
#define MAYBE_AddRemoveRecvStreamAndRender DISABLED_AddRemoveRecvStreamAndRender
#else
#define MAYBE_AddRemoveRecvStreamAndRender AddRemoveRecvStreamAndRender
#endif
TEST_F(WebRtcVideoMediaChannelTest, MAYBE_AddRemoveRecvStreamAndRender) {
Base::AddRemoveRecvStreamAndRender(); Base::AddRemoveRecvStreamAndRender();
} }