Chromium Code Reviews| Index: media/video/capture/video_capture_device_unittest.cc |
| =================================================================== |
| --- media/video/capture/video_capture_device_unittest.cc (revision 98199) |
| +++ media/video/capture/video_capture_device_unittest.cc (working copy) |
| @@ -16,7 +16,7 @@ |
| using ::testing::AtLeast; |
| namespace media { |
| -const int kWaitTime = 3000; |
| +const int kWaitTime = 5000; |
|
Paweł Hajdan Jr.
2011/08/26 21:56:18
Why not base/test/test_timeouts?
perkj_chrome
2011/08/29 11:34:14
Done.
|
| class MockFrameObserver: public media::VideoCaptureDevice::EventHandler { |
| public: |
| @@ -69,7 +69,7 @@ |
| EXPECT_TRUE(device == NULL); |
| } |
| -TEST_F(VideoCaptureDeviceTest, CaptureVGA) { |
| +TEST_F(VideoCaptureDeviceTest, DISABLED_CaptureVGA) { |
| VideoCaptureDevice::GetDeviceNames(&names_); |
| // Make sure there are more than 0 cameras. |
| if (!names_.size()) { |
| @@ -97,7 +97,7 @@ |
| device->DeAllocate(); |
| } |
| -TEST_F(VideoCaptureDeviceTest, Capture720p) { |
| +TEST_F(VideoCaptureDeviceTest, DISABLED_Capture720p) { |
| VideoCaptureDevice::GetDeviceNames(&names_); |
| // Make sure there are more than 0 cameras. |
| if (!names_.size()) { |
| @@ -127,7 +127,7 @@ |
| device->DeAllocate(); |
| } |
| -TEST_F(VideoCaptureDeviceTest, AllocateSameCameraTwice) { |
| +TEST_F(VideoCaptureDeviceTest, DISABLED_AllocateSameCameraTwice) { |
| VideoCaptureDevice::GetDeviceNames(&names_); |
| if (!names_.size()) { |
| LOG(WARNING) << "No camera available. Exiting test."; |
| @@ -154,7 +154,7 @@ |
| device2->DeAllocate(); |
| } |
| -TEST_F(VideoCaptureDeviceTest, AllocateBadSize) { |
| +TEST_F(VideoCaptureDeviceTest, DISABLED_AllocateBadSize) { |
| VideoCaptureDevice::GetDeviceNames(&names_); |
| if (!names_.size()) { |
| LOG(WARNING) << "No camera available. Exiting test."; |
| @@ -175,7 +175,7 @@ |
| device->DeAllocate(); |
| } |
| -TEST_F(VideoCaptureDeviceTest, ReAllocateCamera) { |
| +TEST_F(VideoCaptureDeviceTest, DISABLED_ReAllocateCamera) { |
| VideoCaptureDevice::GetDeviceNames(&names_); |
| if (!names_.size()) { |
| LOG(WARNING) << "No camera available. Exiting test."; |
| @@ -207,7 +207,7 @@ |
| device->DeAllocate(); |
| } |
| -TEST_F(VideoCaptureDeviceTest, DeAllocateCameraWhileRunning) { |
| +TEST_F(VideoCaptureDeviceTest, DISABLED_DeAllocateCameraWhileRunning) { |
| VideoCaptureDevice::GetDeviceNames(&names_); |
| if (!names_.size()) { |
| LOG(WARNING) << "No camera available. Exiting test."; |