Commit fe8864a4 authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot

Disable BrowsingDataRemoverBrowserTest.StorageRemovedFromDisk on CrOS.

The PRE_* test fails, while the non-PRE test passes, causing
browser_tests to fail on bots (but the build remains green):
https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-rel/34103

See crbug.com/1045100 for fixing the build status report.

Bug: 1035156
Change-Id: I70d28db7cc800a40e5f7d6ca8312510a3bf95c65
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017670Reviewed-by: default avatarMartin Šrámek <msramek@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738769}
parent 6fec749f
...@@ -1302,10 +1302,18 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, ...@@ -1302,10 +1302,18 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest,
// payment handler, content settings, autofill, ...? // payment handler, content settings, autofill, ...?
} }
// PRE_StorageRemovedFromDisk fails on Chrome OS. http://crbug.com/1035156.
#if defined(OS_CHROMEOS)
#define MAYBE_PRE_StorageRemovedFromDisk DISABLED_PRE_StorageRemovedFromDisk
#define MAYBE_StorageRemovedFromDisk DISABLED_StorageRemovedFromDisk
#else
#define MAYBE_PRE_StorageRemovedFromDisk PRE_StorageRemovedFromDisk
#define MAYBE_StorageRemovedFromDisk StorageRemovedFromDisk
#endif
// Restart after creating the data to ensure that everything was written to // Restart after creating the data to ensure that everything was written to
// disk. // disk.
IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest,
PRE_StorageRemovedFromDisk) { MAYBE_PRE_StorageRemovedFromDisk) {
EXPECT_EQ(1, GetSiteDataCount()); EXPECT_EQ(1, GetSiteDataCount());
// Expect all datatypes from above except SessionStorage. SessionStorage is // Expect all datatypes from above except SessionStorage. SessionStorage is
// not supported by the CookieTreeModel yet. // not supported by the CookieTreeModel yet.
...@@ -1320,7 +1328,8 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, ...@@ -1320,7 +1328,8 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest,
// Check if any data remains after a deletion and a Chrome restart to force // Check if any data remains after a deletion and a Chrome restart to force
// all writes to be finished. // all writes to be finished.
IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest, StorageRemovedFromDisk) { IN_PROC_BROWSER_TEST_F(BrowsingDataRemoverBrowserTest,
MAYBE_StorageRemovedFromDisk) {
// Deletions should remove all traces of browsing data from disk // Deletions should remove all traces of browsing data from disk
// but there are a few bugs that need to be fixed. // but there are a few bugs that need to be fixed.
// Any addition to this list must have an associated TODO(). // Any addition to this list must have an associated TODO().
......
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