From 334865e2a16df3e1ae77be6eaef764143e827e76 Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Mon, 23 Sep 2013 17:58:45 +0000 Subject: [PATCH] Re-enable VideoCaptureTest.CreateDelete Previously the test insisted on non-zero delay, but 0 is not a crazy delay value (esp. on a fake camera device!). Instead we now test for delay>=0 being set at all. BUG=2405 R=wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2267004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4813 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../modules/video_capture/test/video_capture_unittest.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/webrtc/modules/video_capture/test/video_capture_unittest.cc index 94800ee165..b047bee4ff 100644 --- a/webrtc/modules/video_capture/test/video_capture_unittest.cc +++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc @@ -142,7 +142,7 @@ class TestVideoCaptureCallback : public VideoCaptureDataCallback { public: TestVideoCaptureCallback() : capture_cs_(CriticalSectionWrapper::CreateCriticalSection()), - capture_delay_(0), + capture_delay_(-1), last_render_time_ms_(0), incoming_frames_(0), timing_warnings_(0), @@ -204,7 +204,7 @@ class TestVideoCaptureCallback : public VideoCaptureDataCallback { capability_= capability; incoming_frames_ = 0; last_render_time_ms_ = 0; - capture_delay_ = 0; + capture_delay_ = -1; } int incoming_frames() { CriticalSectionScoped cs(capture_cs_.get()); @@ -356,8 +356,7 @@ TEST_F(VideoCaptureTest, CreateDelete) { // Make sure 5 frames are captured. EXPECT_TRUE_WAIT(capture_observer.incoming_frames() >= 5, kTimeOut); - // TODO(holmer): Disabled due to being flaky. See issue 2405. - // EXPECT_GT(capture_observer.capture_delay(), 0); + EXPECT_GE(capture_observer.capture_delay(), 0); int64_t stop_time = TickTime::MillisecondTimestamp(); EXPECT_EQ(0, module->StopCapture());