diff options
| author | dalecurtis <dalecurtis@chromium.org> | 2015-10-30 11:41:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-30 18:43:24 +0000 |
| commit | 899b90ef820f5fc973357d129e30431604e3a1ab (patch) | |
| tree | 6a4a2b43cdde5bd0b19ffd3dda2edb9eef729fe4 /media | |
| parent | d27923720c70c15eec621e564a66d28eab16e807 (diff) | |
| download | chromium_src-899b90ef820f5fc973357d129e30431604e3a1ab.zip chromium_src-899b90ef820f5fc973357d129e30431604e3a1ab.tar.gz chromium_src-899b90ef820f5fc973357d129e30431604e3a1ab.tar.bz2 | |
Disable VideoCaptureDeviceTest.ReAllocateCamera test.
Fails consistently on my Linux workstation and also seems to have
trouble on a variety of bots that actually have camera hardware,
so disable everywhere.
The primary cause seems to be that this will flake other tests when
run in parallel.
BUG=417824
TEST=all media_unittests pass when a camera is attached.
Review URL: https://codereview.chromium.org/1428853003
Cr-Commit-Position: refs/heads/master@{#357147}
Diffstat (limited to 'media')
| -rw-r--r-- | media/capture/video/video_capture_device_unittest.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/media/capture/video/video_capture_device_unittest.cc b/media/capture/video/video_capture_device_unittest.cc index b5d1dfc..3b951f3 100644 --- a/media/capture/video/video_capture_device_unittest.cc +++ b/media/capture/video/video_capture_device_unittest.cc @@ -46,7 +46,6 @@ // main thread for tests. This results in no frame received by // VideoCaptureAndroid. #define MAYBE_AllocateBadSize DISABLED_AllocateBadSize -#define ReAllocateCamera DISABLED_ReAllocateCamera #define DeAllocateCameraWhileRunning DISABLED_DeAllocateCameraWhileRunning #define DeAllocateCameraWhileRunning DISABLED_DeAllocateCameraWhileRunning #define MAYBE_CaptureMjpeg DISABLED_CaptureMjpeg @@ -329,7 +328,7 @@ TEST_P(VideoCaptureDeviceTest, CaptureWithSize) { } #if !defined(OS_ANDROID) -INSTANTIATE_TEST_CASE_P(MAYBE_VideoCaptureDeviceTests, +INSTANTIATE_TEST_CASE_P(VideoCaptureDeviceTests, VideoCaptureDeviceTest, testing::ValuesIn(kCaptureSizes)); #endif @@ -361,14 +360,8 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_AllocateBadSize) { EXPECT_EQ(input_size.GetArea(), last_format().frame_size.GetArea()); } -// Cause hangs on Windows Debug. http://crbug.com/417824 -#if defined(OS_WIN) && !defined(NDEBUG) -#define MAYBE_ReAllocateCamera DISABLED_ReAllocateCamera -#else -#define MAYBE_ReAllocateCamera ReAllocateCamera -#endif - -TEST_F(VideoCaptureDeviceTest, MAYBE_ReAllocateCamera) { +// Cause hangs on Windows, Linux. Fails Android. http://crbug.com/417824 +TEST_F(VideoCaptureDeviceTest, DISABLED_ReAllocateCamera) { names_ = EnumerateDevices(); if (names_->empty()) { DVLOG(1) << "No camera available. Exiting test."; |