Commit 46bf6346 authored by Patrik Höglund's avatar Patrik Höglund Committed by Commit Bot

Disable flaky capture unittests on Linux.

The tests went flaky when we replaced the bot and get VIDIOC_STREAMON
errors about 25% of the builds. I have no idea to fix that; we tried
replacing the webcam and moving it around in the USB ports and that
didn't help. See http://crbug.com/828568 for discussion.

Bug: chromium:831514
Change-Id: Ic55c09a16a22dd0402c3360b710e310c733ec5f9
Reviewed-on: https://chromium-review.googlesource.com/1016301Reviewed-by: default avatarChristian Fremerey <chfremer@chromium.org>
Commit-Queue: Christian Fremerey <chfremer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552165}
parent 0e1921e8
......@@ -62,30 +62,38 @@
#define MAYBE_CaptureMjpeg DISABLED_CaptureMjpeg
#define MAYBE_TakePhoto TakePhoto
#define MAYBE_GetPhotoState GetPhotoState
#define MAYBE_CaptureWithSize CaptureWithSize
#elif defined(OS_WIN)
#define MAYBE_AllocateBadSize AllocateBadSize
#define MAYBE_CaptureMjpeg CaptureMjpeg
#define MAYBE_TakePhoto TakePhoto
#define MAYBE_GetPhotoState GetPhotoState
#define MAYBE_CaptureWithSize CaptureWithSize
#elif defined(OS_ANDROID)
#define MAYBE_AllocateBadSize AllocateBadSize
#define MAYBE_CaptureMjpeg CaptureMjpeg
#define MAYBE_TakePhoto TakePhoto
#define MAYBE_GetPhotoState GetPhotoState
#define MAYBE_CaptureWithSize CaptureWithSize
#elif defined(OS_LINUX)
// All tests are flaky on Linux: https://crbug.com/831514. Note: the stuff in
// the next comment is a separate issue.
// AllocateBadSize will hang when a real camera is attached and if more than one
// test is trying to use the camera (even across processes). Do NOT renable
// this test without fixing the many bugs associated with it:
// http://crbug.com/94134 http://crbug.com/137260 http://crbug.com/417824
#define MAYBE_AllocateBadSize DISABLED_AllocateBadSize
#define MAYBE_CaptureMjpeg CaptureMjpeg
#define MAYBE_TakePhoto TakePhoto
#define MAYBE_GetPhotoState GetPhotoState
#define MAYBE_CaptureMjpeg DISABLED_CaptureMjpeg
#define MAYBE_TakePhoto DISABLED_TakePhoto
#define MAYBE_GetPhotoState DISABLED_GetPhotoState
#define MAYBE_CaptureWithSize DISABLED_CaptureWithSize
#else
#define MAYBE_AllocateBadSize AllocateBadSize
#define MAYBE_CaptureMjpeg CaptureMjpeg
#define MAYBE_TakePhoto DISABLED_TakePhoto
#define MAYBE_GetPhotoState DISABLED_GetPhotoState
#define MAYBE_CaptureWithSize CaptureWithSize
#endif
// Wrap the TEST_P macro into another one to allow to preprocess |test_name|
......@@ -474,7 +482,7 @@ TEST(VideoCaptureDeviceDescriptor, RemoveTrailingWhitespaceFromDisplayName) {
}
// Allocates the first enumerated device, and expects a frame.
WRAPPED_TEST_P(VideoCaptureDeviceTest, CaptureWithSize) {
WRAPPED_TEST_P(VideoCaptureDeviceTest, MAYBE_CaptureWithSize) {
const auto descriptor = FindUsableDeviceDescriptor();
if (!descriptor)
return;
......
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