diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 20:37:43 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 20:37:43 +0000 |
| commit | d987049400dec7254d5578dc72861ccb4384dbb4 (patch) | |
| tree | 75e476188f817a561a49e1a513b9d37b868362d0 /chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc | |
| parent | d7f14b09a92d2b183a73c57cb7a32b85d39bac0b (diff) | |
| download | chromium_src-d987049400dec7254d5578dc72861ccb4384dbb4.zip chromium_src-d987049400dec7254d5578dc72861ccb4384dbb4.tar.gz chromium_src-d987049400dec7254d5578dc72861ccb4384dbb4.tar.bz2 | |
Disabled flaky PhishingClassifierTest.DisableDetection on Mac OS.
Timing out on Mac Blink bots.
BUG=316709
TBR=jam@chromium.org,ajwong@chromium.org
Review URL: https://codereview.chromium.org/67283003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc')
| -rw-r--r-- | chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc index 9ae14f7..db6d282 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc @@ -267,7 +267,14 @@ IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, TestClassification) { EXPECT_EQ(PhishingClassifier::kInvalidScore, phishy_score); } -IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, DisableDetection) { +// Flaky on Mac Blink bots: crbug.com/316709 +#if defined(OS_MACOSX) +#define MAYBE_DisableDetection DISABLED_DisableDetection +#else +#define MAYBE_DisableDetection DisableDetection +#endif + +IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, MAYBE_DisableDetection) { // No scorer yet, so the classifier is not ready. EXPECT_FALSE(classifier_->is_ready()); |