summaryrefslogtreecommitdiffstats
path: root/net/cert/nss_cert_database_unittest.cc
diff options
context:
space:
mode:
authorhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-08 04:37:06 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-08 04:37:06 +0000
commitd9d39c49fe0d5013097ccd013cb4a8b0e659d35a (patch)
treeeef383ed74267a86cf0e4253d1df8d0f0efecc93 /net/cert/nss_cert_database_unittest.cc
parenta1cffa643a25b5b2a7e8c80b965051d2ce44d0fa (diff)
downloadchromium_src-d9d39c49fe0d5013097ccd013cb4a8b0e659d35a.zip
chromium_src-d9d39c49fe0d5013097ccd013cb4a8b0e659d35a.tar.gz
chromium_src-d9d39c49fe0d5013097ccd013cb4a8b0e659d35a.tar.bz2
net: Disable CertDatabaseNSSTest.TrustIntermediateCa{2,3} on Linux
BUG=224612 TBR=rsleevi@chromium.org Review URL: https://codereview.chromium.org/13768004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/cert/nss_cert_database_unittest.cc')
-rw-r--r--net/cert/nss_cert_database_unittest.cc18
1 files changed, 16 insertions, 2 deletions
diff --git a/net/cert/nss_cert_database_unittest.cc b/net/cert/nss_cert_database_unittest.cc
index 2b3f3f3..aa1bc25 100644
--- a/net/cert/nss_cert_database_unittest.cc
+++ b/net/cert/nss_cert_database_unittest.cc
@@ -762,7 +762,14 @@ TEST_F(CertDatabaseNSSTest, TrustIntermediateCa) {
EXPECT_EQ(CERT_STATUS_REVOKED, verify_result2.cert_status);
}
-TEST_F(CertDatabaseNSSTest, TrustIntermediateCa2) {
+// Fails on Linux. crbug.com/224612
+#if defined(OS_LINUX)
+#define MAYBE_TrustIntermediateCa2 DISABLED_TrustIntermediateCa2
+#else
+#define MAYBE_TrustIntermediateCa2 TrustIntermediateCa2
+#endif
+
+TEST_F(CertDatabaseNSSTest, MAYBE_TrustIntermediateCa2) {
NSSCertDatabase::ImportCertFailureList failed;
CertificateList intermediate_certs = CreateCertificateListFromFile(
@@ -808,7 +815,14 @@ TEST_F(CertDatabaseNSSTest, TrustIntermediateCa2) {
EXPECT_EQ(CERT_STATUS_AUTHORITY_INVALID, verify_result2.cert_status);
}
-TEST_F(CertDatabaseNSSTest, TrustIntermediateCa3) {
+// Fails on Linux. crbug.com/224612
+#if defined(OS_LINUX)
+#define MAYBE_TrustIntermediateCa3 DISABLED_TrustIntermediateCa3
+#else
+#define MAYBE_TrustIntermediateCa3 TrustIntermediateCa3
+#endif
+
+TEST_F(CertDatabaseNSSTest, MAYBE_TrustIntermediateCa3) {
NSSCertDatabase::ImportCertFailureList failed;
CertificateList ca_certs = CreateCertificateListFromFile(