zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert r6420 'Revert r6390 "Adds end to end DataChannel tests." Flaky on linux_memcheck'

Browse Source 
Failing tests are disabled for memcheck.

TBR=wu@webrtc.org
BUG=2626

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

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6422 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
jiayl@webrtc.org
2014-06-12 21:59:29 +00:00
parent 3c13ed3b93
commit 1a6c6281ca
6 changed files with 224 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
talk/app/webrtc/test/peerconnectiontestwrapper.h
View File

@ -52,6 +52,10 @@ class PeerConnectionTestWrapper
bool CreatePc(const webrtc::MediaConstraintsInterface* constraints);
talk_base::scoped_refptr<webrtc::DataChannelInterface> CreateDataChannel(
const std::string& label,
const webrtc::DataChannelInit& init);
// Implements PeerConnectionObserver.
virtual void OnError() {}
virtual void OnSignalingChange(
@ -60,7 +64,7 @@ class PeerConnectionTestWrapper
webrtc::PeerConnectionObserver::StateType state_changed) {}
virtual void OnAddStream(webrtc::MediaStreamInterface* stream);
virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream) {}
virtual void OnDataChannel(webrtc::DataChannelInterface* data_channel) {}
virtual void OnDataChannel(webrtc::DataChannelInterface* data_channel);
virtual void OnRenegotiationNeeded() {}
virtual void OnIceConnectionChange(
webrtc::PeerConnectionInterface::IceConnectionState new_state) {}
@ -94,6 +98,7 @@ class PeerConnectionTestWrapper
const std::string&> SignalOnIceCandidateReady;
sigslot::signal1<std::string*> SignalOnSdpCreated;
sigslot::signal1<const std::string&> SignalOnSdpReady;
sigslot::signal1<webrtc::DataChannelInterface*> SignalOnDataChannel;
private:
void SetLocalDescription(const std::string& type, const std::string& sdp);