Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(638)

Unified Diff: net/spdy/spdy_credential_builder_unittest.cc

Issue 10830354: Disable SpdyCredentialBuilder tests with OpenSSL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Ryan's comments Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/gtest_filter/net_unittests_disabled ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_credential_builder_unittest.cc
diff --git a/net/spdy/spdy_credential_builder_unittest.cc b/net/spdy/spdy_credential_builder_unittest.cc
index 575ce88681d66776608128517e42e732de37f6da..825e97d329d42e932fe7eaa66dd92ad6acbf5cae 100644
--- a/net/spdy/spdy_credential_builder_unittest.cc
+++ b/net/spdy/spdy_credential_builder_unittest.cc
@@ -75,28 +75,60 @@ class SpdyCredentialBuilderTest : public testing::Test {
SpdyCredential credential_;
};
-TEST_F(SpdyCredentialBuilderTest, GetCredentialSecret) {
+// http://crbug.com/142833, http://crbug.com/140991. The following tests fail
+// with OpenSSL due to the unimplemented ec_private_key_openssl.cc.
+#if defined(USE_OPENSSL)
+#define MAYBE_GetCredentialSecret DISABLED_GetCredentialSecret
+#else
+#define MAYBE_GetCredentialSecret GetCredentialSecret
+#endif
+
+TEST_F(SpdyCredentialBuilderTest, MAYBE_GetCredentialSecret) {
std::string secret_str(kSecretPrefix, arraysize(kSecretPrefix));
secret_str.append(MockClientSocket::kTlsUnique);
EXPECT_EQ(secret_str, GetCredentialSecret());
}
-TEST_F(SpdyCredentialBuilderTest, SucceedsWithECDSACert) {
+#if defined(USE_OPENSSL)
+#define MAYBE_SucceedsWithECDSACert DISABLED_SucceedsWithECDSACert
+#else
+#define MAYBE_SucceedsWithECDSACert SucceedsWithECDSACert
+#endif
+
+TEST_F(SpdyCredentialBuilderTest, MAYBE_SucceedsWithECDSACert) {
EXPECT_EQ(OK, BuildWithType(CLIENT_CERT_ECDSA_SIGN));
}
-TEST_F(SpdyCredentialBuilderTest, FailsWithRSACert) {
+#if defined(USE_OPENSSL)
+#define MAYBE_FailsWithRSACert DISABLED_FailsWithRSACert
+#else
+#define MAYBE_FailsWithRSACert FailsWithRSACert
+#endif
+
+TEST_F(SpdyCredentialBuilderTest, MAYBE_FailsWithRSACert) {
EXPECT_EQ(ERR_BAD_SSL_CLIENT_AUTH_CERT,
BuildWithType(CLIENT_CERT_RSA_SIGN));
}
-TEST_F(SpdyCredentialBuilderTest, SetsSlotCorrectly) {
+#if defined(USE_OPENSSL)
+#define MAYBE_SetsSlotCorrectly DISABLED_SetsSlotCorrectly
+#else
+#define MAYBE_SetsSlotCorrectly SetsSlotCorrectly
+#endif
+
+TEST_F(SpdyCredentialBuilderTest, MAYBE_SetsSlotCorrectly) {
ASSERT_EQ(OK, Build());
EXPECT_EQ(kSlot, credential_.slot);
}
-TEST_F(SpdyCredentialBuilderTest, SetsCertCorrectly) {
+#if defined(USE_OPENSSL)
+#define MAYBE_SetsCertCorrectly DISABLED_SetsCertCorrectly
+#else
+#define MAYBE_SetsCertCorrectly SetsCertCorrectly
+#endif
+
+TEST_F(SpdyCredentialBuilderTest, MAYBE_SetsCertCorrectly) {
ASSERT_EQ(OK, Build());
base::StringPiece spki;
ASSERT_TRUE(asn1::ExtractSPKIFromDERCert(cert_, &spki));
@@ -108,7 +140,13 @@ TEST_F(SpdyCredentialBuilderTest, SetsCertCorrectly) {
EXPECT_EQ(spk.substr(2, spk.length()).as_string(), credential_.certs[0]);
}
-TEST_F(SpdyCredentialBuilderTest, SetsProofCorrectly) {
+#if defined(USE_OPENSSL)
+#define MAYBE_SetsProofCorrectly DISABLED_SetsProofCorrectly
+#else
+#define MAYBE_SetsProofCorrectly SetsProofCorrectly
+#endif
+
+TEST_F(SpdyCredentialBuilderTest, MAYBE_SetsProofCorrectly) {
ASSERT_EQ(OK, Build());
base::StringPiece spki;
ASSERT_TRUE(asn1::ExtractSPKIFromDERCert(cert_, &spki));
« no previous file with comments | « build/android/gtest_filter/net_unittests_disabled ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698