Commit ea901c56 authored by Nina Satragno's avatar Nina Satragno Committed by Commit Bot

[sheriff] Disable TSAN MediaHistoryStoreFeedsTest

Disable MediaHistoryStoreFeedsTest.* on TSAN builders. These tests are
flaky on TSAN, likely due to a race condition with ScopedFeatureList.

TBR=beccahughes@chromium.org

Bug: 1087974
Change-Id: Id215412e6918a91b390f8fbd099adc1e4a0cc043
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2222554Reviewed-by: default avatarNina Satragno <nsatragno@chromium.org>
Commit-Queue: Nina Satragno <nsatragno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773329}
parent 96110dfa
...@@ -289,7 +289,13 @@ INSTANTIATE_TEST_SUITE_P( ...@@ -289,7 +289,13 @@ INSTANTIATE_TEST_SUITE_P(
TestState::kIncognito, TestState::kIncognito,
TestState::kSavingBrowserHistoryDisabled)); TestState::kSavingBrowserHistoryDisabled));
TEST_P(MediaHistoryStoreUnitTest, SavePlayback) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_SavePlayback DISABLED_SavePlayback
#else
#define MAYBE_SavePlayback SavePlayback
#endif
TEST_P(MediaHistoryStoreUnitTest, MAYBE_SavePlayback) {
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
const auto now_before = const auto now_before =
...@@ -357,7 +363,13 @@ TEST_P(MediaHistoryStoreUnitTest, SavePlayback) { ...@@ -357,7 +363,13 @@ TEST_P(MediaHistoryStoreUnitTest, SavePlayback) {
MediaHistoryStore::PlaybackWriteResult::kSuccess, IsReadOnly() ? 0 : 2); MediaHistoryStore::PlaybackWriteResult::kSuccess, IsReadOnly() ? 0 : 2);
} }
TEST_P(MediaHistoryStoreUnitTest, GetStats) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_GetStats DISABLED_GetStats
#else
#define MAYBE_GetStats GetStats
#endif
TEST_P(MediaHistoryStoreUnitTest, MAYBE_GetStats) {
{ {
// Check all the tables are empty. // Check all the tables are empty.
mojom::MediaHistoryStatsPtr stats = GetStatsSync(service()); mojom::MediaHistoryStatsPtr stats = GetStatsSync(service());
...@@ -417,7 +429,13 @@ TEST_P(MediaHistoryStoreUnitTest, GetStats) { ...@@ -417,7 +429,13 @@ TEST_P(MediaHistoryStoreUnitTest, GetStats) {
} }
} }
TEST_P(MediaHistoryStoreUnitTest, UrlShouldBeUniqueForSessions) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_UrlShouldBeUniqueForSessions DISABLED_UrlShouldBeUniqueForSessions
#else
#define MAYBE_UrlShouldBeUniqueForSessions UrlShouldBeUniqueForSessions
#endif
TEST_P(MediaHistoryStoreUnitTest, MAYBE_UrlShouldBeUniqueForSessions) {
base::HistogramTester histogram_tester; base::HistogramTester histogram_tester;
GURL url_a("https://www.google.com"); GURL url_a("https://www.google.com");
...@@ -491,7 +509,16 @@ TEST_P(MediaHistoryStoreUnitTest, UrlShouldBeUniqueForSessions) { ...@@ -491,7 +509,16 @@ TEST_P(MediaHistoryStoreUnitTest, UrlShouldBeUniqueForSessions) {
MediaHistoryStore::SessionWriteResult::kSuccess, IsReadOnly() ? 0 : 3); MediaHistoryStore::SessionWriteResult::kSuccess, IsReadOnly() ? 0 : 3);
} }
TEST_P(MediaHistoryStoreUnitTest, SavePlayback_IncrementAggregateWatchtime) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_SavePlayback_IncrementAggregateWatchtime \
DISABLED_SavePlayback_IncrementAggregateWatchtime
#else
#define MAYBE_SavePlayback_IncrementAggregateWatchtime \
SavePlayback_IncrementAggregateWatchtime
#endif
TEST_P(MediaHistoryStoreUnitTest,
MAYBE_SavePlayback_IncrementAggregateWatchtime) {
GURL url("http://google.com/test"); GURL url("http://google.com/test");
GURL url_alt("http://example.org/test"); GURL url_alt("http://example.org/test");
...@@ -597,7 +624,13 @@ TEST_P(MediaHistoryStoreUnitTest, SavePlayback_IncrementAggregateWatchtime) { ...@@ -597,7 +624,13 @@ TEST_P(MediaHistoryStoreUnitTest, SavePlayback_IncrementAggregateWatchtime) {
EXPECT_EQ(origins, GetOriginRowsSync(otr_service())); EXPECT_EQ(origins, GetOriginRowsSync(otr_service()));
} }
TEST_P(MediaHistoryStoreUnitTest, DiscoverMediaFeed_Noop) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_DiscoverMediaFeed_Noop DISABLED_DiscoverMediaFeed_Noop
#else
#define MAYBE_DiscoverMediaFeed_Noop DiscoverMediaFeed_Noop
#endif
TEST_P(MediaHistoryStoreUnitTest, MAYBE_DiscoverMediaFeed_Noop) {
DiscoverMediaFeed(GURL("https://www.google.com/feed")); DiscoverMediaFeed(GURL("https://www.google.com/feed"));
WaitForDB(); WaitForDB();
...@@ -913,7 +946,13 @@ INSTANTIATE_TEST_SUITE_P(All, ...@@ -913,7 +946,13 @@ INSTANTIATE_TEST_SUITE_P(All,
testing::Values(TestState::kNormal, testing::Values(TestState::kNormal,
TestState::kIncognito)); TestState::kIncognito));
TEST_P(MediaHistoryStoreFeedsTest, DiscoverMediaFeed) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_DiscoverMediaFeed DISABLED_DiscoverMediaFeed
#else
#define MAYBE_DiscoverMediaFeed DiscoverMediaFeed
#endif
TEST_P(MediaHistoryStoreFeedsTest, MAYBE_DiscoverMediaFeed) {
GURL url_a("https://www.google.com/feed"); GURL url_a("https://www.google.com/feed");
GURL url_b("https://www.google.co.uk/feed"); GURL url_b("https://www.google.co.uk/feed");
GURL url_c("https://www.google.com/feed2"); GURL url_c("https://www.google.com/feed2");
...@@ -978,7 +1017,13 @@ TEST_P(MediaHistoryStoreFeedsTest, DiscoverMediaFeed) { ...@@ -978,7 +1017,13 @@ TEST_P(MediaHistoryStoreFeedsTest, DiscoverMediaFeed) {
} }
} }
TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_StoreMediaFeedFetchResult DISABLED_StoreMediaFeedFetchResult
#else
#define MAYBE_StoreMediaFeedFetchResult StoreMediaFeedFetchResult
#endif
TEST_P(MediaHistoryStoreFeedsTest, MAYBE_StoreMediaFeedFetchResult) {
const GURL feed_url("https://www.google.com/feed"); const GURL feed_url("https://www.google.com/feed");
DiscoverMediaFeed(feed_url); DiscoverMediaFeed(feed_url);
WaitForDB(); WaitForDB();
...@@ -1137,7 +1182,15 @@ TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult) { ...@@ -1137,7 +1182,15 @@ TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult) {
} }
} }
TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_WithEmpty) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_StoreMediaFeedFetchResult_WithEmpty \
DISABLED_StoreMediaFeedFetchResult_WithEmpty
#else
#define MAYBE_StoreMediaFeedFetchResult_WithEmpty \
StoreMediaFeedFetchResult_WithEmpty
#endif
TEST_P(MediaHistoryStoreFeedsTest, MAYBE_StoreMediaFeedFetchResult_WithEmpty) {
DiscoverMediaFeed(GURL("https://www.google.com/feed")); DiscoverMediaFeed(GURL("https://www.google.com/feed"));
WaitForDB(); WaitForDB();
...@@ -1181,7 +1234,16 @@ TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_WithEmpty) { ...@@ -1181,7 +1234,16 @@ TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_WithEmpty) {
} }
} }
TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_MultipleFeeds) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_StoreMediaFeedFetchResult_MultipleFeeds \
DISABLED_StoreMediaFeedFetchResult_MultipleFeeds
#else
#define MAYBE_StoreMediaFeedFetchResult_MultipleFeeds \
StoreMediaFeedFetchResult_MultipleFeeds
#endif
TEST_P(MediaHistoryStoreFeedsTest,
MAYBE_StoreMediaFeedFetchResult_MultipleFeeds) {
const GURL feed_a_url("https://www.google.com/feed"); const GURL feed_a_url("https://www.google.com/feed");
const GURL feed_b_url("https://www.google.co.uk/feed"); const GURL feed_b_url("https://www.google.co.uk/feed");
...@@ -1262,7 +1324,13 @@ TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_MultipleFeeds) { ...@@ -1262,7 +1324,13 @@ TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_MultipleFeeds) {
} }
} }
TEST_P(MediaHistoryStoreFeedsTest, RediscoverMediaFeed) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_RediscoverMediaFeed DISABLED_RediscoverMediaFeed
#else
#define MAYBE_RediscoverMediaFeed RediscoverMediaFeed
#endif
TEST_P(MediaHistoryStoreFeedsTest, MAYBE_RediscoverMediaFeed) {
GURL feed_url("https://www.google.com/feed"); GURL feed_url("https://www.google.com/feed");
DiscoverMediaFeed(feed_url); DiscoverMediaFeed(feed_url);
WaitForDB(); WaitForDB();
...@@ -1355,7 +1423,16 @@ TEST_P(MediaHistoryStoreFeedsTest, RediscoverMediaFeed) { ...@@ -1355,7 +1423,16 @@ TEST_P(MediaHistoryStoreFeedsTest, RediscoverMediaFeed) {
} }
} }
TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_IncreaseFailed) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_StoreMediaFeedFetchResult_IncreaseFailed \
DISABLED_StoreMediaFeedFetchResult_IncreaseFailed
#else
#define MAYBE_StoreMediaFeedFetchResult_IncreaseFailed \
StoreMediaFeedFetchResult_IncreaseFailed
#endif
TEST_P(MediaHistoryStoreFeedsTest,
MAYBE_StoreMediaFeedFetchResult_IncreaseFailed) {
DiscoverMediaFeed(GURL("https://www.google.com/feed")); DiscoverMediaFeed(GURL("https://www.google.com/feed"));
WaitForDB(); WaitForDB();
...@@ -1439,7 +1516,16 @@ TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_IncreaseFailed) { ...@@ -1439,7 +1516,16 @@ TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_IncreaseFailed) {
} }
} }
TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_CheckLogoMax) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_StoreMediaFeedFetchResult_CheckLogoMax \
DISABLED_StoreMediaFeedFetchResult_CheckLogoMax
#else
#define MAYBE_StoreMediaFeedFetchResult_CheckLogoMax \
StoreMediaFeedFetchResult_CheckLogoMax
#endif
TEST_P(MediaHistoryStoreFeedsTest,
MAYBE_StoreMediaFeedFetchResult_CheckLogoMax) {
DiscoverMediaFeed(GURL("https://www.google.com/feed")); DiscoverMediaFeed(GURL("https://www.google.com/feed"));
WaitForDB(); WaitForDB();
...@@ -1516,7 +1602,16 @@ TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_CheckLogoMax) { ...@@ -1516,7 +1602,16 @@ TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_CheckLogoMax) {
} }
} }
TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_CheckImageMax) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_StoreMediaFeedFetchResult_CheckImageMax \
DISABLED_StoreMediaFeedFetchResult_CheckImageMax
#else
#define MAYBE_StoreMediaFeedFetchResult_CheckImageMax \
StoreMediaFeedFetchResult_CheckImageMax
#endif
TEST_P(MediaHistoryStoreFeedsTest,
MAYBE_StoreMediaFeedFetchResult_CheckImageMax) {
DiscoverMediaFeed(GURL("https://www.google.com/feed")); DiscoverMediaFeed(GURL("https://www.google.com/feed"));
WaitForDB(); WaitForDB();
...@@ -1596,8 +1691,16 @@ TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_CheckImageMax) { ...@@ -1596,8 +1691,16 @@ TEST_P(MediaHistoryStoreFeedsTest, StoreMediaFeedFetchResult_CheckImageMax) {
} }
} }
// TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_StoreMediaFeedFetchResult_DefaultSafeSearchResult \
DISABLED_StoreMediaFeedFetchResult_DefaultSafeSearchResult
#else
#define MAYBE_StoreMediaFeedFetchResult_DefaultSafeSearchResult \
StoreMediaFeedFetchResult_DefaultSafeSearchResult
#endif
TEST_P(MediaHistoryStoreFeedsTest, TEST_P(MediaHistoryStoreFeedsTest,
StoreMediaFeedFetchResult_DefaultSafeSearchResult) { MAYBE_StoreMediaFeedFetchResult_DefaultSafeSearchResult) {
DiscoverMediaFeed(GURL("https://www.google.com/feed")); DiscoverMediaFeed(GURL("https://www.google.com/feed"));
WaitForDB(); WaitForDB();
...@@ -1635,7 +1738,13 @@ TEST_P(MediaHistoryStoreFeedsTest, ...@@ -1635,7 +1738,13 @@ TEST_P(MediaHistoryStoreFeedsTest,
} }
} }
TEST_P(MediaHistoryStoreFeedsTest, SafeSearchCheck) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_SafeSearchCheck DISABLED_SafeSearchCheck
#else
#define MAYBE_SafeSearchCheck SafeSearchCheck
#endif
TEST_P(MediaHistoryStoreFeedsTest, MAYBE_SafeSearchCheck) {
DiscoverMediaFeed(GURL("https://www.google.com/feed")); DiscoverMediaFeed(GURL("https://www.google.com/feed"));
DiscoverMediaFeed(GURL("https://www.google.co.uk/feed")); DiscoverMediaFeed(GURL("https://www.google.co.uk/feed"));
WaitForDB(); WaitForDB();
...@@ -1745,7 +1854,16 @@ TEST_P(MediaHistoryStoreFeedsTest, SafeSearchCheck) { ...@@ -1745,7 +1854,16 @@ TEST_P(MediaHistoryStoreFeedsTest, SafeSearchCheck) {
} }
} }
TEST_P(MediaHistoryStoreFeedsTest, GetMediaFeedsSortByWatchtimePercentile) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_GetMediaFeedsSortByWatchtimePercentile \
DISABLED_GetMediaFeedsSortByWatchtimePercentile
#else
#define MAYBE_GetMediaFeedsSortByWatchtimePercentile \
GetMediaFeedsSortByWatchtimePercentile
#endif
TEST_P(MediaHistoryStoreFeedsTest,
MAYBE_GetMediaFeedsSortByWatchtimePercentile) {
// We add 111 origins with watchtime and feeds for all but one of these. Half // We add 111 origins with watchtime and feeds for all but one of these. Half
// of the feeds will have items. // of the feeds will have items.
const unsigned kNumberOfOrigins = 111; const unsigned kNumberOfOrigins = 111;
...@@ -2003,7 +2121,13 @@ TEST_P(MediaHistoryStoreFeedsTest, GetMediaFeedsSortByWatchtimePercentile) { ...@@ -2003,7 +2121,13 @@ TEST_P(MediaHistoryStoreFeedsTest, GetMediaFeedsSortByWatchtimePercentile) {
} }
} }
TEST_P(MediaHistoryStoreFeedsTest, FeedItemsClickAndShown) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_FeedItemsClickAndShown DISABLED_FeedItemsClickAndShown
#else
#define MAYBE_FeedItemsClickAndShown FeedItemsClickAndShown
#endif
TEST_P(MediaHistoryStoreFeedsTest, MAYBE_FeedItemsClickAndShown) {
DiscoverMediaFeed(GURL("https://www.google.com/feed")); DiscoverMediaFeed(GURL("https://www.google.com/feed"));
WaitForDB(); WaitForDB();
...@@ -2119,7 +2243,13 @@ TEST_P(MediaHistoryStoreFeedsTest, FeedItemsClickAndShown) { ...@@ -2119,7 +2243,13 @@ TEST_P(MediaHistoryStoreFeedsTest, FeedItemsClickAndShown) {
} }
} }
TEST_P(MediaHistoryStoreFeedsTest, ResetMediaFeed) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_ResetMediaFeed DISABLED_ResetMediaFeed
#else
#define MAYBE_ResetMediaFeed ResetMediaFeed
#endif
TEST_P(MediaHistoryStoreFeedsTest, MAYBE_ResetMediaFeed) {
const GURL feed_url_a("https://www.google.com/feed"); const GURL feed_url_a("https://www.google.com/feed");
const GURL feed_url_b("https://www.google.co.uk/feed"); const GURL feed_url_b("https://www.google.co.uk/feed");
...@@ -2291,7 +2421,14 @@ TEST_P(MediaHistoryStoreFeedsTest, ResetMediaFeed) { ...@@ -2291,7 +2421,14 @@ TEST_P(MediaHistoryStoreFeedsTest, ResetMediaFeed) {
} }
} }
TEST_P(MediaHistoryStoreFeedsTest, ResetMediaFeedDueToCacheClearing) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_ResetMediaFeedDueToCacheClearing \
DISABLED_ResetMediaFeedDueToCacheClearing
#else
#define MAYBE_ResetMediaFeedDueToCacheClearing ResetMediaFeedDueToCacheClearing
#endif
TEST_P(MediaHistoryStoreFeedsTest, MAYBE_ResetMediaFeedDueToCacheClearing) {
const GURL feed_url_a("https://www.google.com/feed"); const GURL feed_url_a("https://www.google.com/feed");
const GURL feed_url_b("https://www.google.co.uk/feed"); const GURL feed_url_b("https://www.google.co.uk/feed");
...@@ -2566,7 +2703,13 @@ TEST_P(MediaHistoryStoreFeedsTest, ResetMediaFeedDueToCacheClearing) { ...@@ -2566,7 +2703,13 @@ TEST_P(MediaHistoryStoreFeedsTest, ResetMediaFeedDueToCacheClearing) {
} }
} }
TEST_P(MediaHistoryStoreFeedsTest, DeleteMediaFeed) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_DeleteMediaFeed DISABLED_DeleteMediaFeed
#else
#define MAYBE_DeleteMediaFeed DeleteMediaFeed
#endif
TEST_P(MediaHistoryStoreFeedsTest, MAYBE_DeleteMediaFeed) {
DiscoverMediaFeed(GURL("https://www.google.com/feed")); DiscoverMediaFeed(GURL("https://www.google.com/feed"));
DiscoverMediaFeed(GURL("https://www.google.co.uk/feed")); DiscoverMediaFeed(GURL("https://www.google.co.uk/feed"));
WaitForDB(); WaitForDB();
...@@ -2637,7 +2780,13 @@ TEST_P(MediaHistoryStoreFeedsTest, DeleteMediaFeed) { ...@@ -2637,7 +2780,13 @@ TEST_P(MediaHistoryStoreFeedsTest, DeleteMediaFeed) {
} }
} }
TEST_P(MediaHistoryStoreFeedsTest, GetMediaFeedFetchDetails) { // TODO(crbug.com/1087974).
#if defined(THREAD_SANITIZER)
#define MAYBE_GetMediaFeedFetchDetails DISABLED_GetMediaFeedFetchDetails
#else
#define MAYBE_GetMediaFeedFetchDetails GetMediaFeedFetchDetails
#endif
TEST_P(MediaHistoryStoreFeedsTest, MAYBE_GetMediaFeedFetchDetails) {
const GURL feed_url("https://www.google.com/feed"); const GURL feed_url("https://www.google.com/feed");
DiscoverMediaFeed(feed_url); DiscoverMediaFeed(feed_url);
......
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