summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/net
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-20 02:01:26 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-20 02:01:26 +0000
commitc044616ec1a51a544e454077ff08cb471f9bd2b9 (patch)
tree0e1550feffd69a223e53b5eb1f0ff7ea26e978e1 /chrome_frame/test/net
parent383f8178cf281382ab55c79630e0691fd06582c4 (diff)
downloadchromium_src-c044616ec1a51a544e454077ff08cb471f9bd2b9.zip
chromium_src-c044616ec1a51a544e454077ff08cb471f9bd2b9.tar.gz
chromium_src-c044616ec1a51a544e454077ff08cb471f9bd2b9.tar.bz2
Re-enable some network tests that have been disabled for
over a year due to failures with Chrome Frame. Keep them disabled for Chrome Frame tests. Also disable two of them on Android. BUG=102991 Review URL: https://codereview.chromium.org/12042058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/net')
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 21a0b34..97adf3f 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -205,6 +205,11 @@ void FilterDisabledTests() {
"HTTPSRequestTest.HTTPSExpiredTest",
"HTTPSRequestTest.ClientAuthTest",
+ // More HTTPS tests failing due to certificate dialogs.
+ // http://crbug.com/102991
+ "URLRequestTestHTTP.HTTPSToHTTPRedirectNoRefererTest",
+ "HTTPSRequestTest.HTTPSGetTest",
+
// Tests chrome's network stack's cache (might not apply to CF).
"URLRequestTestHTTP.VaryHeader",
"URLRequestTestHTTP.GetZippedTest",
@@ -269,6 +274,7 @@ void FilterDisabledTests() {
// These tests are disabled as they rely on functionality provided by
// Chrome's HTTP stack like the ability to set the proxy for a URL, etc.
"URLRequestTestHTTP.ProxyTunnelRedirectTest",
+ "URLRequestTestHTTP.NetworkDelegateTunnelConnectionFailed",
"URLRequestTestHTTP.UnexpectedServerAuthTest",
// These tests are disabled as they expect an empty UA to be echoed back