summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorbryner@chromium.org <bryner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-05 22:01:02 +0000
committerbryner@chromium.org <bryner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-05 22:01:02 +0000
commit6d3367dda416f9b2a5e23e9c7d41a2c9578d2e40 (patch)
treeb47cc892c2e19704b7bceb0b28abc9d52e39e8e4 /chrome/renderer
parent05f48dff22277bb57f5a2af9b73969985db79ba7 (diff)
downloadchromium_src-6d3367dda416f9b2a5e23e9c7d41a2c9578d2e40.zip
chromium_src-6d3367dda416f9b2a5e23e9c7d41a2c9578d2e40.tar.gz
chromium_src-6d3367dda416f9b2a5e23e9c7d41a2c9578d2e40.tar.bz2
Fix client-side phishing detection test flakiness and ChromeOS failure.
The problem is that RenderViewFakeResourcesTest creates a RenderThreadImpl, but without setting up the sandbox environment, specifically the domain socket used on Linux. This caused the sandbox's pre-assigned file descriptor to be taken by other files or sockets, leading to a hang when the sandbox code tries to talk to the browser. To fix this, add a way for tests to disable the WebSandboxSupport implementation in RendererWebKitPlatformSupportImpl. The problem also affects WebRTCAudioDeviceTest, so fixed it there as well. BUG=128705 Review URL: https://chromiumcodereview.appspot.com/10449094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140631 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc4
-rw-r--r--chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc14
-rw-r--r--chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc10
3 files changed, 14 insertions, 14 deletions
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc
index af4b859..d60035f 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
@@ -132,7 +132,7 @@ class PhishingClassifierTest : public content::RenderViewFakeResourcesTest {
ClientPhishingRequest verdict_;
};
-TEST_F(PhishingClassifierTest, DISABLED_TestClassification) {
+TEST_F(PhishingClassifierTest, TestClassification) {
// No scorer yet, so the classifier is not ready.
EXPECT_FALSE(classifier_->is_ready());
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
index 7da54d2..c947a5d 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
@@ -99,7 +99,7 @@ class PhishingClassifierDelegateTest
scoped_ptr<ClientPhishingRequest> verdict_;
};
-TEST_F(PhishingClassifierDelegateTest, DISABLED_Navigation) {
+TEST_F(PhishingClassifierDelegateTest, Navigation) {
MockPhishingClassifier* classifier =
new StrictMock<MockPhishingClassifier>(view());
PhishingClassifierDelegate* delegate =
@@ -223,7 +223,7 @@ TEST_F(PhishingClassifierDelegateTest, DISABLED_Navigation) {
EXPECT_CALL(*classifier, CancelPendingClassification());
}
-TEST_F(PhishingClassifierDelegateTest, DISABLED_NoScorer) {
+TEST_F(PhishingClassifierDelegateTest, NoScorer) {
// For this test, we'll create the delegate with no scorer available yet.
MockPhishingClassifier* classifier =
new StrictMock<MockPhishingClassifier>(view());
@@ -260,7 +260,7 @@ TEST_F(PhishingClassifierDelegateTest, DISABLED_NoScorer) {
EXPECT_CALL(*classifier, CancelPendingClassification());
}
-TEST_F(PhishingClassifierDelegateTest, DISABLED_NoScorer_Ref) {
+TEST_F(PhishingClassifierDelegateTest, NoScorer_Ref) {
// Similar to the last test, but navigates within the page before
// setting the scorer.
MockPhishingClassifier* classifier =
@@ -292,7 +292,7 @@ TEST_F(PhishingClassifierDelegateTest, DISABLED_NoScorer_Ref) {
EXPECT_CALL(*classifier, CancelPendingClassification());
}
-TEST_F(PhishingClassifierDelegateTest, DISABLED_NoStartPhishingDetection) {
+TEST_F(PhishingClassifierDelegateTest, NoStartPhishingDetection) {
// Tests the behavior when OnStartPhishingDetection has not yet been called
// when the page load finishes.
MockPhishingClassifier* classifier =
@@ -365,7 +365,7 @@ TEST_F(PhishingClassifierDelegateTest, DISABLED_NoStartPhishingDetection) {
EXPECT_CALL(*classifier, CancelPendingClassification());
}
-TEST_F(PhishingClassifierDelegateTest, DISABLED_IgnorePreliminaryCapture) {
+TEST_F(PhishingClassifierDelegateTest, IgnorePreliminaryCapture) {
// Tests that preliminary PageCaptured notifications are ignored.
MockPhishingClassifier* classifier =
new StrictMock<MockPhishingClassifier>(view());
@@ -397,7 +397,7 @@ TEST_F(PhishingClassifierDelegateTest, DISABLED_IgnorePreliminaryCapture) {
EXPECT_CALL(*classifier, CancelPendingClassification());
}
-TEST_F(PhishingClassifierDelegateTest, DISABLED_DuplicatePageCapture) {
+TEST_F(PhishingClassifierDelegateTest, DuplicatePageCapture) {
// Tests that a second PageCaptured notification causes classification to
// be cancelled.
MockPhishingClassifier* classifier =
@@ -431,7 +431,7 @@ TEST_F(PhishingClassifierDelegateTest, DISABLED_DuplicatePageCapture) {
EXPECT_CALL(*classifier, CancelPendingClassification());
}
-TEST_F(PhishingClassifierDelegateTest, DISABLED_PhishingDetectionDone) {
+TEST_F(PhishingClassifierDelegateTest, PhishingDetectionDone) {
// Tests that a PhishingDetectionDone IPC is sent to the browser
// whenever we finish classification.
MockPhishingClassifier* classifier =
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 69c2eae..c5043ff 100644
--- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc
+++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc
@@ -92,7 +92,7 @@ class PhishingDOMFeatureExtractorTest
base::WeakPtrFactory<PhishingDOMFeatureExtractorTest> weak_factory_;
};
-TEST_F(PhishingDOMFeatureExtractorTest, DISABLED_FormFeatures) {
+TEST_F(PhishingDOMFeatureExtractorTest, FormFeatures) {
// This test doesn't exercise the extraction timing.
EXPECT_CALL(clock_, Now()).WillRepeatedly(Return(base::TimeTicks::Now()));
responses_["http://host.com/"] =
@@ -150,7 +150,7 @@ TEST_F(PhishingDOMFeatureExtractorTest, DISABLED_FormFeatures) {
EXPECT_THAT(features.features(), ContainerEq(expected_features.features()));
}
-TEST_F(PhishingDOMFeatureExtractorTest, DISABLED_LinkFeatures) {
+TEST_F(PhishingDOMFeatureExtractorTest, LinkFeatures) {
// This test doesn't exercise the extraction timing.
EXPECT_CALL(clock_, Now()).WillRepeatedly(Return(base::TimeTicks::Now()));
responses_["http://www.host.com/"] =
@@ -192,7 +192,7 @@ TEST_F(PhishingDOMFeatureExtractorTest, DISABLED_LinkFeatures) {
EXPECT_THAT(features.features(), ContainerEq(expected_features.features()));
}
-TEST_F(PhishingDOMFeatureExtractorTest, DISABLED_ScriptAndImageFeatures) {
+TEST_F(PhishingDOMFeatureExtractorTest, ScriptAndImageFeatures) {
// This test doesn't exercise the extraction timing.
EXPECT_CALL(clock_, Now()).WillRepeatedly(Return(base::TimeTicks::Now()));
responses_["http://host.com/"] =
@@ -223,7 +223,7 @@ TEST_F(PhishingDOMFeatureExtractorTest, DISABLED_ScriptAndImageFeatures) {
EXPECT_THAT(features.features(), ContainerEq(expected_features.features()));
}
-TEST_F(PhishingDOMFeatureExtractorTest, DISABLED_SubFrames) {
+TEST_F(PhishingDOMFeatureExtractorTest, SubFrames) {
// This test doesn't exercise the extraction timing.
EXPECT_CALL(clock_, Now()).WillRepeatedly(Return(base::TimeTicks::Now()));
@@ -358,7 +358,7 @@ TEST_F(PhishingDOMFeatureExtractorTest, Continuation) {
EXPECT_FALSE(ExtractFeatures(&features));
}
-TEST_F(PhishingDOMFeatureExtractorTest, DISABLED_SubframeRemoval) {
+TEST_F(PhishingDOMFeatureExtractorTest, SubframeRemoval) {
// In this test, we'll advance the feature extractor so that it is positioned
// inside an iframe, and have it pause due to exceeding the chunk time limit.
// Then, prior to continuation, the iframe is removed from the document.