From def22b455b818217201a110fb9b4ef65bc18378e Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Tue, 29 Oct 2013 10:12:10 +0000 Subject: [PATCH] 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@5049 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video/video_send_stream_tests.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc index edcbb2c93..358ecf3fb 100644 --- a/webrtc/video/video_send_stream_tests.cc +++ b/webrtc/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 rtp_header_parser_; scoped_ptr 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,