diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 23:26:24 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 23:26:24 +0000 |
| commit | 6d40150161aae62242c6c4431f6452f45a9ceee5 (patch) | |
| tree | e444c93bfbf61c53e0d680b7b9de6a0e80663b0b /chrome/browser/safe_browsing | |
| parent | adbda59b25a349bab5df95cb86c1e42b9b0ed333 (diff) | |
| download | chromium_src-6d40150161aae62242c6c4431f6452f45a9ceee5.zip chromium_src-6d40150161aae62242c6c4431f6452f45a9ceee5.tar.gz chromium_src-6d40150161aae62242c6c4431f6452f45a9ceee5.tar.bz2 | |
Disable a few broken phishing tests on windows.
According to the recent try bots runs, this is the breakdown of the failures:
9 OnPhishingDetectionDoneDisabled
17 OnPhishingDetectionDoneInvalidVerdict
10 OnPhishingDetectionDoneNotPhishing
3 OnPhishingDetectionDoneVerdictNotPhishing
This seems to be a crash in ChromeAppCacheService::InitializeonIOThread
BUG=115979
Review URL: https://chromiumcodereview.appspot.com/10391018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing')
| -rw-r--r-- | chrome/browser/safe_browsing/client_side_detection_host_unittest.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc index b39b63b..7916c1a 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc @@ -316,8 +316,8 @@ class ClientSideDetectionHostTest : public TabContentsWrapperTestHarness { scoped_ptr<content::TestBrowserThread> io_thread_; }; -#if defined(OS_CHROMEOS) -// Crashes on linux_chromeos. http://crbug.com/115979 +#if defined(OS_CHROMEOS) || defined(OS_WIN) +// Crashes on linux_chromeos and win_rel http://crbug.com/115979 #define MAYBE_OnPhishingDetectionDoneInvalidVerdict \ DISABLED_OnPhishingDetectionDoneInvalidVerdict #define MAYBE_OnPhishingDetectionDoneVerdictNotPhishing \ @@ -342,8 +342,8 @@ TEST_F(ClientSideDetectionHostTest, EXPECT_TRUE(Mock::VerifyAndClear(mock_extractor)); } -#if defined(OS_LINUX) -// Crashes on linux_chromeos. http://crbug.com/115979 +#if defined(OS_LINUX) || defined(OS_WIN) +// Crashes on linux_chromeos and win_rel. http://crbug.com/115979 #define MAYBE_OnPhishingDetectionDoneNotPhishing \ DISABLED_OnPhishingDetectionDoneNotPhishing #else @@ -384,7 +384,8 @@ TEST_F(ClientSideDetectionHostTest, EXPECT_TRUE(Mock::VerifyAndClear(sb_service_.get())); } -#if defined(OS_CHROMEOS) +#if defined(OS_CHROMEOS) || defined(OS_WIN) +// Crashes on linux_chromeos and win_rel. http://crbug.com/115979 TEST_F(ClientSideDetectionHostTest, FLAKY_OnPhishingDetectionDoneDisabled) { #else TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneDisabled) { |