diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-29 10:12:10 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-29 10:12:10 +0000 |
| commit | 86868fee51f96514dc9986b724893452111658f6 (patch) | |
| tree | b1352585d539cdf4b209136def0a41e2525af971 /video | |
| parent | 367af84454999aced8fe21019adfaa8052c5f45f (diff) | |
| download | webrtc-86868fee51f96514dc9986b724893452111658f6.tar.gz | |
Stop DirectTransports in VideoSendStreamTests.
Prevents racy packet delivery during or after Call destruction.
BUG=
R=stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/3099005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5049 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video')
| -rw-r--r-- | video/video_send_stream_tests.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc index edcbb2c9..358ecf3f 100644 --- a/video/video_send_stream_tests.cc +++ b/video/video_send_stream_tests.cc @@ -40,6 +40,8 @@ class SendTransportObserver : public test::NullTransport { EventTypeWrapper Wait() { return send_test_complete_->Wait(timeout_ms_); } + virtual void Stop() {} + protected: scoped_ptr<RtpHeaderParser> rtp_header_parser_; scoped_ptr<EventWrapper> send_test_complete_; @@ -65,6 +67,7 @@ class VideoSendStreamTest : public ::testing::Test { EXPECT_EQ(kEventSignaled, observer->Wait()); + observer->Stop(); frame_generator_capturer->Stop(); send_stream->StopSend(); call->DestroySendStream(send_stream); @@ -336,6 +339,8 @@ TEST_F(VideoSendStreamTest, SupportsFec) { return true; } + virtual void Stop() OVERRIDE { transport_.StopSending(); } + private: internal::TransportAdapter transport_adapter_; test::DirectTransport transport_; @@ -409,6 +414,8 @@ void VideoSendStreamTest::TestNackRetransmission(uint32_t retransmit_ssrc) { return true; } + virtual void Stop() OVERRIDE { transport_.StopSending(); } + private: internal::TransportAdapter transport_adapter_; test::DirectTransport transport_; @@ -555,6 +562,8 @@ TEST_F(VideoSendStreamTest, AutoMute) { void set_high_remb_bps(int value) { high_remb_bps_ = value; } + virtual void Stop() OVERRIDE { transport_.StopSending(); } + private: enum TestState { kBeforeMute, |