Commit 6a4c6510 authored by jmadill's avatar jmadill Committed by Commit bot

Disable two hanging video capture tests on Windows.

Seems to happen in Debug mode. Turn these off until we can find a fix.

BUG=417824,416594

Review URL: https://codereview.chromium.org/604983002

Cr-Commit-Position: refs/heads/master@{#297275}
parent c827ad1c
...@@ -201,7 +201,14 @@ class VideoCaptureDeviceTest : public testing::Test { ...@@ -201,7 +201,14 @@ class VideoCaptureDeviceTest : public testing::Test {
scoped_ptr<VideoCaptureDeviceFactory> video_capture_device_factory_; scoped_ptr<VideoCaptureDeviceFactory> video_capture_device_factory_;
}; };
TEST_F(VideoCaptureDeviceTest, OpenInvalidDevice) { // Cause hangs on Windows Debug. http://crbug.com/417824
#if defined(OS_WIN) && !defined(NDEBUG)
#define MAYBE_OpenInvalidDevice DISABLED_OpenInvalidDevice
#else
#define MAYBE_OpenInvalidDevice OpenInvalidDevice
#endif
TEST_F(VideoCaptureDeviceTest, MAYBE_OpenInvalidDevice) {
#if defined(OS_WIN) #if defined(OS_WIN)
VideoCaptureDevice::Name::CaptureApiType api_type = VideoCaptureDevice::Name::CaptureApiType api_type =
VideoCaptureDeviceFactoryWin::PlatformSupportsMediaFoundation() VideoCaptureDeviceFactoryWin::PlatformSupportsMediaFoundation()
...@@ -313,7 +320,14 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_AllocateBadSize) { ...@@ -313,7 +320,14 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_AllocateBadSize) {
EXPECT_EQ(last_format().frame_size.height(), 480); EXPECT_EQ(last_format().frame_size.height(), 480);
} }
TEST_F(VideoCaptureDeviceTest, ReAllocateCamera) { // 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) {
names_ = EnumerateDevices(); names_ = EnumerateDevices();
if (!names_->size()) { if (!names_->size()) {
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