summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-09 07:27:58 +0000
committerkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-09 07:27:58 +0000
commit172b8f316daa5dc83868f86f8a8f3b06d0cd690f (patch)
tree47f44ce63c366b703d5edc865e484b0c2ef5aeb7
parent480b0eafa51e30d4b578abc0ad6ddca797c08582 (diff)
downloadchromium_src-172b8f316daa5dc83868f86f8a8f3b06d0cd690f.zip
chromium_src-172b8f316daa5dc83868f86f8a8f3b06d0cd690f.tar.gz
chromium_src-172b8f316daa5dc83868f86f8a8f3b06d0cd690f.tar.bz2
Disable flaky PhishingClassifierTest.TestClassification on Mac OS X.
BUG=316709 TBR=jam@chromium.org Review URL: https://codereview.chromium.org/62823003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234120 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc9
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 db6d282..d2f633c 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc
@@ -197,7 +197,14 @@ class PhishingClassifierTest : public InProcessBrowserTest {
const std::string page_term_login_;
};
-IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, TestClassification) {
+// Flaky on Mac Blink bots: crbug.com/316709
+#if defined(OS_MACOSX)
+#define MAYBE_TestClassification DISABLED_TestClassification
+#else
+#define MAYBE_TestClassification TestClassification
+#endif
+
+IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, MAYBE_TestClassification) {
host_resolver()->AddRule("*", "127.0.0.1");
// No scorer yet, so the classifier is not ready.