diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 05:53:47 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 05:53:47 +0000 |
| commit | 97e1cf634c5f89d37c9685b9c8178e280788e368 (patch) | |
| tree | 5ac8a7dd2aecd1c978b4bc59b49081d51b2feb84 /net | |
| parent | 082795ce0df315ba957e873dd68af3c68da452f4 (diff) | |
| download | chromium_src-97e1cf634c5f89d37c9685b9c8178e280788e368.zip chromium_src-97e1cf634c5f89d37c9685b9c8178e280788e368.tar.gz chromium_src-97e1cf634c5f89d37c9685b9c8178e280788e368.tar.bz2 | |
Disable OCSP tests on Android
The on-demand OCSP test server is not supported on Android. Disable
these tests.
BUG=119642
TEST=green bots
Review URL: http://codereview.chromium.org/9837027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128414 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/test/remote_test_server.cc | 6 | ||||
| -rw-r--r-- | net/url_request/url_request_unittest.cc | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/net/test/remote_test_server.cc b/net/test/remote_test_server.cc index df1b979..640a052 100644 --- a/net/test/remote_test_server.cc +++ b/net/test/remote_test_server.cc @@ -82,6 +82,12 @@ bool RemoteTestServer::Start() { if (!GenerateArguments(&arguments_dict)) return false; + if (arguments_dict.HasKey("ocsp")) { + NOTIMPLEMENTED() << "OCSP on-demand generation is not supported. " + << "See http://crbug.com/119642."; + return false; + } + // Append the 'server-type' argument which is used by spawner server to // pass right server type to Python test server. arguments_dict.SetString("server-type", GetServerTypeString(type())); diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index f31f368..859f3f5 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -1375,6 +1375,10 @@ TEST_F(HTTPSRequestTest, HTTPSExpiredTest) { } } +// http://crbug.com/119642 - The Android test server does not support +// generating OCSP responses on the fly. +#if !defined(OS_ANDROID) + class TestSSLConfigService : public SSLConfigService { public: TestSSLConfigService(bool ev_enabled, bool online_rev_checking) @@ -1684,6 +1688,8 @@ TEST_F(HTTPSCRLSetTest, ExpiredCRLSet) { EXPECT_FALSE(cert_status & CERT_STATUS_REV_CHECKING_ENABLED); } +#endif // !defined(OS_ANDROID) + // This tests that a load of www.google.com with a certificate error sets // the |certificate_errors_are_fatal| flag correctly. This flag will cause // the interstitial to be fatal. |