Commit 33fe2fc7 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Commit Bot

[Sheriff] Disable MediaHistoryBrowserTest.DoNotRecordWatchtime_Background/0...

[Sheriff] Disable MediaHistoryBrowserTest.DoNotRecordWatchtime_Background/0 and DoNotRecordWatchtime_Muted/0 flaky on 6 builders.

The builders are linux-chromeos-dbg, Mac ASan 64 Tests (1), Linux ChromiumOS MSan Tests,
Win7 Tests (dbg)(1), Linux Tests (dbg)(1), and Linux CFI.

Bug: 1086794
Change-Id: If0b9d37b3d4662880916f26b8acfc5612200e075
Tbr: beccahughes@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2216098
Commit-Queue: Takashi Sakamoto <tasak@google.com>
Reviewed-by: default avatarTakashi Sakamoto <tasak@google.com>
Cr-Commit-Position: refs/heads/master@{#772101}
parent 84369be3
...@@ -1254,8 +1254,18 @@ IN_PROC_BROWSER_TEST_P(MediaHistoryBrowserTest, ...@@ -1254,8 +1254,18 @@ IN_PROC_BROWSER_TEST_P(MediaHistoryBrowserTest,
} }
} }
#if (defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)) && \
!defined(NDEBUG)
// TODO(1086794): failing on linux-chromeos-dbg, Linux Tests(dbg)(1) and Win7
// Tests(dbg).
#define MAYBE_DoNotRecordWatchtime_Background \
DISABLED_DoNotRecordWatchtime_Background
#else
#define MAYBE_DoNotRecordWatchtime_Background DoNotRecordWatchtime_Background
#endif
IN_PROC_BROWSER_TEST_P(MediaHistoryBrowserTest, IN_PROC_BROWSER_TEST_P(MediaHistoryBrowserTest,
DoNotRecordWatchtime_Background) { MAYBE_DoNotRecordWatchtime_Background) {
auto* browser = CreateBrowserFromParam(); auto* browser = CreateBrowserFromParam();
auto* service = GetMediaHistoryService(browser); auto* service = GetMediaHistoryService(browser);
...@@ -1280,7 +1290,17 @@ IN_PROC_BROWSER_TEST_P(MediaHistoryBrowserTest, ...@@ -1280,7 +1290,17 @@ IN_PROC_BROWSER_TEST_P(MediaHistoryBrowserTest,
EXPECT_TRUE(playbacks.empty()); EXPECT_TRUE(playbacks.empty());
} }
IN_PROC_BROWSER_TEST_P(MediaHistoryBrowserTest, DoNotRecordWatchtime_Muted) { #if (defined(OS_CHROMEOS) || defined(OS_LINUX)) && \
(defined(IS_CFI) || !defined(NDEBUG) || defined(ADDRESS_SANITIZER))
// TODO(1086794): failing on linux-chromeos-dbg, Linux Tests(dbg)(1) and Linux
// CFI.
#define MAYBE_DoNotRecordWatchtime_Muted DISABLED_DoNotRecordWatchtime_Muted
#else
#define MAYBE_DoNotRecordWatchtime_Muted DoNotRecordWatchtime_Muted
#endif
IN_PROC_BROWSER_TEST_P(MediaHistoryBrowserTest,
MAYBE_DoNotRecordWatchtime_Muted) {
auto* browser = CreateBrowserFromParam(); auto* browser = CreateBrowserFromParam();
auto* service = GetMediaHistoryService(browser); auto* service = GetMediaHistoryService(browser);
......
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