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

enabling disabled data channels tests on win32. The real culprit was that ice candidates not included in SDP when there were failure causing transport channels never becoming writable.

Browse Source 
BUG=2799
R=jiayl@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5410 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mallinath@webrtc.org 2014-01-22 00:16:46 +00:00
parent 7de3bb9df9
commit 68cbd01216
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
talk/app/webrtc/peerconnectioninterface_unittest.cc
View File

@ -179,6 +179,7 @@ class MockPeerConnectionObserver : public PeerConnectionObserver {
EXPECT_EQ(pc_->ice_gathering_state(), new_state); EXPECT_EQ(pc_->ice_gathering_state(), new_state);
} }
virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) { virtual void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) {
EXPECT_NE(PeerConnectionInterface::kIceGatheringNew, EXPECT_NE(PeerConnectionInterface::kIceGatheringNew,
pc_->ice_gathering_state()); pc_->ice_gathering_state());
@ -496,6 +497,8 @@ class PeerConnectionInterfaceTest : public testing::Test {
EXPECT_TRUE(DoSetLocalDescription(new_offer)); EXPECT_TRUE(DoSetLocalDescription(new_offer));
EXPECT_EQ(PeerConnectionInterface::kHaveLocalOffer, observer_.state_); EXPECT_EQ(PeerConnectionInterface::kHaveLocalOffer, observer_.state_);
// Wait for the ice_complete message, so that SDP will have candidates.
EXPECT_TRUE_WAIT(observer_.ice_complete_, kTimeout);
} }
void CreateAnswerAsRemoteDescription(const std::string& offer) { void CreateAnswerAsRemoteDescription(const std::string& offer) {
@ -766,13 +769,7 @@ TEST_F(PeerConnectionInterfaceTest, GetStatsForInvalidTrack) {
} }
// This test setup two RTP data channels in loop back. // This test setup two RTP data channels in loop back.
#ifdef WIN32
// TODO(perkj): Investigate why the transport channel sometimes don't become
// writable on Windows when we try to connect in loop back.
TEST_F(PeerConnectionInterfaceTest, DISABLED_TestDataChannel) {
#else
TEST_F(PeerConnectionInterfaceTest, TestDataChannel) { TEST_F(PeerConnectionInterfaceTest, TestDataChannel) {
#endif
FakeConstraints constraints; FakeConstraints constraints;
constraints.SetAllowRtpDataChannels(); constraints.SetAllowRtpDataChannels();
CreatePeerConnection(&constraints); CreatePeerConnection(&constraints);
@ -819,13 +816,7 @@ TEST_F(PeerConnectionInterfaceTest, TestDataChannel) {
// This test verifies that sendnig binary data over RTP data channels should // This test verifies that sendnig binary data over RTP data channels should
// fail. // fail.
#ifdef WIN32
// TODO(perkj): Investigate why the transport channel sometimes don't become
// writable on Windows when we try to connect in loop back.
TEST_F(PeerConnectionInterfaceTest, DISABLED_TestSendBinaryOnRtpDataChannel) {
#else
TEST_F(PeerConnectionInterfaceTest, TestSendBinaryOnRtpDataChannel) { TEST_F(PeerConnectionInterfaceTest, TestSendBinaryOnRtpDataChannel) {
#endif
FakeConstraints constraints; FakeConstraints constraints;
constraints.SetAllowRtpDataChannels(); constraints.SetAllowRtpDataChannels();
CreatePeerConnection(&constraints); CreatePeerConnection(&constraints);
@ -855,13 +846,7 @@ TEST_F(PeerConnectionInterfaceTest, TestSendBinaryOnRtpDataChannel) {
// This test setup a RTP data channels in loop back and test that a channel is // This test setup a RTP data channels in loop back and test that a channel is
// opened even if the remote end answer with a zero SSRC. // opened even if the remote end answer with a zero SSRC.
#ifdef WIN32
// TODO(perkj): Investigate why the transport channel sometimes don't become
// writable on Windows when we try to connect in loop back.
TEST_F(PeerConnectionInterfaceTest, DISABLED_TestSendOnlyDataChannel) {
#else
TEST_F(PeerConnectionInterfaceTest, TestSendOnlyDataChannel) { TEST_F(PeerConnectionInterfaceTest, TestSendOnlyDataChannel) {
#endif
FakeConstraints constraints; FakeConstraints constraints;
constraints.SetAllowRtpDataChannels(); constraints.SetAllowRtpDataChannels();
CreatePeerConnection(&constraints); CreatePeerConnection(&constraints);
@ -1017,14 +1002,7 @@ TEST_F(PeerConnectionInterfaceTest,
} }
// This test that a data channel closes when a PeerConnection is deleted/closed. // This test that a data channel closes when a PeerConnection is deleted/closed.
#ifdef WIN32
// TODO(perkj): Investigate why the transport channel sometimes don't become
// writable on Windows when we try to connect in loop back.
TEST_F(PeerConnectionInterfaceTest,
DISABLED_DataChannelCloseWhenPeerConnectionClose) {
#else
TEST_F(PeerConnectionInterfaceTest, DataChannelCloseWhenPeerConnectionClose) { TEST_F(PeerConnectionInterfaceTest, DataChannelCloseWhenPeerConnectionClose) {
#endif
FakeConstraints constraints; FakeConstraints constraints;
constraints.SetAllowRtpDataChannels(); constraints.SetAllowRtpDataChannels();
CreatePeerConnection(&constraints); CreatePeerConnection(&constraints);