Commit acb49cef authored by jam@chromium.org's avatar jam@chromium.org

Disable cookie content settings test on mac asan cause they're timing out there.

BUG=145000
Review URL: https://chromiumcodereview.appspot.com/10867088

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153495 0039d316-1c4b-4281-b951-d872f2087c98
parent dcfdad9b
...@@ -89,6 +89,9 @@ class ContentSettingsTest : public InProcessBrowserTest { ...@@ -89,6 +89,9 @@ class ContentSettingsTest : public InProcessBrowserTest {
net::TestServer https_server_; net::TestServer https_server_;
}; };
// Timing out on Mac ASAN. http://crbug.com/145000
#if !defined(OS_MACOSX) && !defined(ADDRESS_SANITIZER)
// Sanity check on cookies before we do other tests. While these can be written // Sanity check on cookies before we do other tests. While these can be written
// in content_browsertests, we want to verify Chrome's cookie storage and how it // in content_browsertests, we want to verify Chrome's cookie storage and how it
// handles incognito windows. // handles incognito windows.
...@@ -135,6 +138,8 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest, BlockCookies) { ...@@ -135,6 +138,8 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest, BlockCookies) {
GetDefaultCookieSetting(NULL)); GetDefaultCookieSetting(NULL));
} }
#endif // !defined(OS_MACOSX) && !defined(ADDRESS_SANITIZER)
// Verify that cookies can be allowed and set using exceptions for particular // Verify that cookies can be allowed and set using exceptions for particular
// website(s) when all others are blocked. // website(s) when all others are blocked.
IN_PROC_BROWSER_TEST_F(ContentSettingsTest, AllowCookiesUsingExceptions) { IN_PROC_BROWSER_TEST_F(ContentSettingsTest, AllowCookiesUsingExceptions) {
......
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