Commit 9bda72c3 authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot

Revert "Disable all failing capture_unittests after latest Chrome OS LKGM update."

This reverts commit 2c8f8ff6.

Reason for revert: New LKGM updates have landed. Could be safe to re-enable. 

Original change's description:
> Disable all failing capture_unittests after latest Chrome OS LKGM update.
> 
> These tests have started failing after fec354dc.
> 
> Tbr: guidou@chromium.org
> Bug: 1048934
> Change-Id: Id54e609d286cea6c4b2506edc11c3bc1433d46c4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2038253
> Commit-Queue: Ben Pastene <bpastene@chromium.org>
> Reviewed-by: Ben Pastene <bpastene@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#738428}

TBR=guidou@chromium.org,bpastene@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1048934
Change-Id: I3b06ed57ad1544cf1e7969143140d1c50ebc0559
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2050574Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#740448}
parent a6525084
...@@ -94,11 +94,9 @@ ...@@ -94,11 +94,9 @@
#define MAYBE_UsingRealWebcam_AllocateBadSize \ #define MAYBE_UsingRealWebcam_AllocateBadSize \
DISABLED_UsingRealWebcam_AllocateBadSize DISABLED_UsingRealWebcam_AllocateBadSize
#define MAYBE_UsingRealWebcam_CaptureMjpeg UsingRealWebcam_CaptureMjpeg #define MAYBE_UsingRealWebcam_CaptureMjpeg UsingRealWebcam_CaptureMjpeg
#define MAYBE_UsingRealWebcam_TakePhoto DISABLED_UsingRealWebcam_TakePhoto #define MAYBE_UsingRealWebcam_TakePhoto UsingRealWebcam_TakePhoto
#define MAYBE_UsingRealWebcam_GetPhotoState \ #define MAYBE_UsingRealWebcam_GetPhotoState UsingRealWebcam_GetPhotoState
DISABLED_UsingRealWebcam_GetPhotoState #define MAYBE_UsingRealWebcam_CaptureWithSize UsingRealWebcam_CaptureWithSize
#define MAYBE_UsingRealWebcam_CaptureWithSize \
DISABLED_UsingRealWebcam_CaptureWithSize
#define MAYBE_UsingRealWebcam_CheckPhotoCallbackRelease \ #define MAYBE_UsingRealWebcam_CheckPhotoCallbackRelease \
UsingRealWebcam_CheckPhotoCallbackRelease UsingRealWebcam_CheckPhotoCallbackRelease
#elif defined(OS_LINUX) #elif defined(OS_LINUX)
...@@ -481,8 +479,6 @@ class VideoCaptureDeviceTest ...@@ -481,8 +479,6 @@ class VideoCaptureDeviceTest
// Cause hangs on Windows Debug. http://crbug.com/417824 // Cause hangs on Windows Debug. http://crbug.com/417824
#if defined(OS_WIN) && !defined(NDEBUG) #if defined(OS_WIN) && !defined(NDEBUG)
#define MAYBE_OpenInvalidDevice DISABLED_OpenInvalidDevice #define MAYBE_OpenInvalidDevice DISABLED_OpenInvalidDevice
#elif defined(OS_CHROMEOS)
#define MAYBE_OpenInvalidDevice DISABLED_OpenInvalidDevice
#else #else
#define MAYBE_OpenInvalidDevice OpenInvalidDevice #define MAYBE_OpenInvalidDevice OpenInvalidDevice
#endif #endif
...@@ -711,13 +707,7 @@ void VideoCaptureDeviceTest::RunCaptureMjpegTestCase() { ...@@ -711,13 +707,7 @@ void VideoCaptureDeviceTest::RunCaptureMjpegTestCase() {
device->StopAndDeAllocate(); device->StopAndDeAllocate();
} }
#if defined(OS_CHROMEOS) WRAPPED_TEST_P(VideoCaptureDeviceTest, NoCameraSupportsPixelFormatMax) {
#define MAYBE_NoCameraSupportsPixelFormatMax \
DISABLED_NoCameraSupportsPixelFormatMax
#else
#define MAYBE_NoCameraSupportsPixelFormatMax NoCameraSupportsPixelFormatMax
#endif
WRAPPED_TEST_P(VideoCaptureDeviceTest, MAYBE_NoCameraSupportsPixelFormatMax) {
RunTestCase(base::BindOnce( RunTestCase(base::BindOnce(
&VideoCaptureDeviceTest::RunNoCameraSupportsPixelFormatMaxTestCase, &VideoCaptureDeviceTest::RunNoCameraSupportsPixelFormatMaxTestCase,
base::Unretained(this))); base::Unretained(this)));
......
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