diff options
| author | vabr <vabr@chromium.org> | 2014-11-17 02:29:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-17 10:29:33 +0000 |
| commit | 066c860a26d1062f9aa700d3d652f0f6b0a0c737 (patch) | |
| tree | 24cc60f153dd866c7f9cc16b98e8d5df89740e6b | |
| parent | bb9e511e364421bee7aa4c8bbf2fc5bfff7fd23a (diff) | |
| download | chromium_src-066c860a26d1062f9aa700d3d652f0f6b0a0c737.zip chromium_src-066c860a26d1062f9aa700d3d652f0f6b0a0c737.tar.gz chromium_src-066c860a26d1062f9aa700d3d652f0f6b0a0c737.tar.bz2 | |
Disable two more Phishing* tests
PhishingClassifierDelegateTest.IgnorePreliminaryCapture failed, e.g., on http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20%281%29/builds/4359
PhishingDOMFeatureExtractorTest.Continuation failed, e.g., on http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20%281%29/builds/4369
More info in http://crbug.com/373155#c8
BUG=373155
TBR=mattm@chromium.org
Review URL: https://codereview.chromium.org/716013004
Cr-Commit-Position: refs/heads/master@{#304402}
| -rw-r--r-- | chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc | 8 | ||||
| -rw-r--r-- | chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc index dc753b8..861fc1d 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc @@ -539,8 +539,14 @@ IN_PROC_BROWSER_TEST_F(PhishingClassifierDelegateTest, EXPECT_CALL(*classifier_, CancelPendingClassification()); } +// Test flakes with LSAN enabled. See http://crbug.com/373155. +#if defined(LEAK_SANITIZER) +#define MAYBE_IgnorePreliminaryCapture DISABLED_IgnorePreliminaryCapture +#else +#define MAYBE_IgnorePreliminaryCapture IgnorePreliminaryCapture +#endif IN_PROC_BROWSER_TEST_F(PhishingClassifierDelegateTest, - IgnorePreliminaryCapture) { + MAYBE_IgnorePreliminaryCapture) { // Tests that preliminary PageCaptured notifications are ignored. MockScorer scorer; delegate_->SetPhishingScorer(&scorer); diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc index b55232f..c71ef5f 100644 --- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc @@ -394,7 +394,13 @@ IN_PROC_BROWSER_TEST_F(PhishingDOMFeatureExtractorTest, SubFrames) { ExpectFeatureMapsAreEqual(features, expected_features); } -IN_PROC_BROWSER_TEST_F(PhishingDOMFeatureExtractorTest, Continuation) { +// Test flakes with LSAN enabled. See http://crbug.com/373155. +#if defined(LEAK_SANITIZER) +#define MAYBE_Continuation DISABLED_Continuation +#else +#define MAYBE_Continuation Continuation +#endif +IN_PROC_BROWSER_TEST_F(PhishingDOMFeatureExtractorTest, MAYBE_Continuation) { // For this test, we'll cause the feature extraction to run multiple // iterations by incrementing the clock. |