diff options
| author | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 22:41:10 +0000 |
|---|---|---|
| committer | ericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 22:41:10 +0000 |
| commit | a3188df6b3b129364a0d370326eff102dfc00d8d (patch) | |
| tree | 180cf884c7ff81abfa728535ef2b03875bc727ea /chrome/browser/safe_browsing/safe_browsing_test.cc | |
| parent | 24b3e6077d788f54d2456c09a915621d6acc1e7c (diff) | |
| download | chromium_src-a3188df6b3b129364a0d370326eff102dfc00d8d.zip chromium_src-a3188df6b3b129364a0d370326eff102dfc00d8d.tar.gz chromium_src-a3188df6b3b129364a0d370326eff102dfc00d8d.tar.bz2 | |
Mark SafeBrowsingServiceTest.SafeBrowsingSystemTest as flaky.
BUG=96489
TEST=n/a
TBR=lzheng@chromium.org
Review URL: http://codereview.chromium.org/7890019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing/safe_browsing_test.cc')
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_test.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index 689522d..c13c6db 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -546,7 +546,13 @@ class SafeBrowsingServiceTestHelper DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServiceTestHelper); }; -IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, SafeBrowsingSystemTest) { +#if defined(OS_WIN) && defined(NDEBUG) +#define MAYBE_SafeBrowsingSystemTest FLAKY_SafeBrowsingSystemTest +#else +#define MAYBE_SafeBrowsingSystemTest SafeBrowsingServiceTest +#endif +// See http://crbug.com/96489 +IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, MAYBE_SafeBrowsingSystemTest) { LOG(INFO) << "Start test"; const char* server_host = SafeBrowsingTestServer::Host(); int server_port = SafeBrowsingTestServer::Port(); |