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

Make P2PTestConductor use VirtualSocketServer.

Browse Source 
Permits running JsepPeerConnectionP2PTestClient in parallel.

TBR=juberti@webrtc.org
BUG=2598
TEST=third_party/gtest-parallel/gtest-parallel -w 128 -r 100 out/Debug/libjingle_peerconnection_unittest --gtest_filter=JsepPeerConnectionP2PTestClient.*

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7988 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2015-01-02 09:03:19 +00:00
parent c62749fb47
commit 9eacb8cc59
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
talk/app/webrtc/peerconnection_unittest.cc
View File

@ -46,14 +46,16 @@
#include "talk/app/webrtc/test/mockpeerconnectionobservers.h" #include "talk/app/webrtc/test/mockpeerconnectionobservers.h"
#include "talk/app/webrtc/videosourceinterface.h" #include "talk/app/webrtc/videosourceinterface.h"
#include "talk/media/webrtc/fakewebrtcvideoengine.h" #include "talk/media/webrtc/fakewebrtcvideoengine.h"
#include "webrtc/p2p/base/constants.h"
#include "webrtc/p2p/base/sessiondescription.h"
#include "talk/session/media/mediasession.h" #include "talk/session/media/mediasession.h"
#include "webrtc/base/gunit.h" #include "webrtc/base/gunit.h"
#include "webrtc/base/physicalsocketserver.h"
#include "webrtc/base/scoped_ptr.h" #include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/ssladapter.h" #include "webrtc/base/ssladapter.h"
#include "webrtc/base/sslstreamadapter.h" #include "webrtc/base/sslstreamadapter.h"
#include "webrtc/base/thread.h" #include "webrtc/base/thread.h"
#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/p2p/base/constants.h"
#include "webrtc/p2p/base/sessiondescription.h"
#define MAYBE_SKIP_TEST(feature) \ #define MAYBE_SKIP_TEST(feature) \
if (!(feature())) { \ if (!(feature())) { \
@ -869,10 +871,16 @@ class JsepTestClient
template <typename SignalingClass> template <typename SignalingClass>
class P2PTestConductor : public testing::Test { class P2PTestConductor : public testing::Test {
public: public:
P2PTestConductor()
: pss_(new rtc::PhysicalSocketServer),
ss_(new rtc::VirtualSocketServer(pss_.get())),
ss_scope_(ss_.get()) {}
bool SessionActive() { bool SessionActive() {
return initiating_client_->SessionActive() && return initiating_client_->SessionActive() &&
receiving_client_->SessionActive(); receiving_client_->SessionActive();
} }
// Return true if the number of frames provided have been received or it is // Return true if the number of frames provided have been received or it is
// known that that will never occur (e.g. no frames will be sent or // known that that will never occur (e.g. no frames will be sent or
// captured). // captured).
@ -1058,6 +1066,9 @@ class P2PTestConductor : public testing::Test {
SignalingClass* receiving_client() { return receiving_client_.get(); } SignalingClass* receiving_client() { return receiving_client_.get(); }
private: private:
rtc::scoped_ptr<rtc::PhysicalSocketServer> pss_;
rtc::scoped_ptr<rtc::VirtualSocketServer> ss_;
rtc::SocketServerScope ss_scope_;
rtc::scoped_ptr<SignalingClass> initiating_client_; rtc::scoped_ptr<SignalingClass> initiating_client_;
rtc::scoped_ptr<SignalingClass> receiving_client_; rtc::scoped_ptr<SignalingClass> receiving_client_;
}; };