Commit 899b90ef authored by dalecurtis's avatar dalecurtis Committed by Commit bot

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}
parent d2792372
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
// main thread for tests. This results in no frame received by // main thread for tests. This results in no frame received by
// VideoCaptureAndroid. // VideoCaptureAndroid.
#define MAYBE_AllocateBadSize DISABLED_AllocateBadSize #define MAYBE_AllocateBadSize DISABLED_AllocateBadSize
#define ReAllocateCamera DISABLED_ReAllocateCamera
#define DeAllocateCameraWhileRunning DISABLED_DeAllocateCameraWhileRunning #define DeAllocateCameraWhileRunning DISABLED_DeAllocateCameraWhileRunning
#define DeAllocateCameraWhileRunning DISABLED_DeAllocateCameraWhileRunning #define DeAllocateCameraWhileRunning DISABLED_DeAllocateCameraWhileRunning
#define MAYBE_CaptureMjpeg DISABLED_CaptureMjpeg #define MAYBE_CaptureMjpeg DISABLED_CaptureMjpeg
...@@ -329,7 +328,7 @@ TEST_P(VideoCaptureDeviceTest, CaptureWithSize) { ...@@ -329,7 +328,7 @@ TEST_P(VideoCaptureDeviceTest, CaptureWithSize) {
} }
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
INSTANTIATE_TEST_CASE_P(MAYBE_VideoCaptureDeviceTests, INSTANTIATE_TEST_CASE_P(VideoCaptureDeviceTests,
VideoCaptureDeviceTest, VideoCaptureDeviceTest,
testing::ValuesIn(kCaptureSizes)); testing::ValuesIn(kCaptureSizes));
#endif #endif
...@@ -361,14 +360,8 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_AllocateBadSize) { ...@@ -361,14 +360,8 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_AllocateBadSize) {
EXPECT_EQ(input_size.GetArea(), last_format().frame_size.GetArea()); EXPECT_EQ(input_size.GetArea(), last_format().frame_size.GetArea());
} }
// Cause hangs on Windows Debug. http://crbug.com/417824 // Cause hangs on Windows, Linux. Fails Android. http://crbug.com/417824
#if defined(OS_WIN) && !defined(NDEBUG) TEST_F(VideoCaptureDeviceTest, DISABLED_ReAllocateCamera) {
#define MAYBE_ReAllocateCamera DISABLED_ReAllocateCamera
#else
#define MAYBE_ReAllocateCamera ReAllocateCamera
#endif
TEST_F(VideoCaptureDeviceTest, MAYBE_ReAllocateCamera) {
names_ = EnumerateDevices(); names_ = EnumerateDevices();
if (names_->empty()) { if (names_->empty()) {
DVLOG(1) << "No camera available. Exiting test."; DVLOG(1) << "No camera available. Exiting test.";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment