summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authorszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-14 17:24:07 +0000
committerszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-14 17:24:07 +0000
commit00bfb39189360e7527531051d14120d7c7cdf684 (patch)
treee78ff25b19d36958b647c61705e4745e75c75af4 /net/base
parent66a6714044e1a0b7a39ff525ca98c682ed66c0d8 (diff)
downloadchromium_src-00bfb39189360e7527531051d14120d7c7cdf684.zip
chromium_src-00bfb39189360e7527531051d14120d7c7cdf684.tar.gz
chromium_src-00bfb39189360e7527531051d14120d7c7cdf684.tar.bz2
Disable three CertDatabaseNSSTests to green the tree.
BUG=132781 TEST=./net_unittests --gtest_filter=CertDatabaseNSStest.* NOTRY=true Review URL: https://chromiumcodereview.appspot.com/10532144 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142159 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/cert_database_nss_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/base/cert_database_nss_unittest.cc b/net/base/cert_database_nss_unittest.cc
index 7000aa0..dcf91d9 100644
--- a/net/base/cert_database_nss_unittest.cc
+++ b/net/base/cert_database_nss_unittest.cc
@@ -379,7 +379,7 @@ TEST_F(CertDatabaseNSSTest, ImportCA_NotCACert) {
EXPECT_EQ(0U, ListCertsInSlot(slot_->os_module_handle()).size());
}
-TEST_F(CertDatabaseNSSTest, ImportCACertHierarchy) {
+TEST_F(CertDatabaseNSSTest, FLAKY_ImportCACertHierarchy) {
CertificateList certs;
ASSERT_TRUE(ReadCertIntoList("dod_root_ca_2_cert.der", &certs));
ASSERT_TRUE(ReadCertIntoList("dod_ca_17_cert.der", &certs));
@@ -405,7 +405,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchy) {
EXPECT_EQ("DOD CA-17", cert_list[1]->subject().common_name);
}
-TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyDupeRoot) {
+TEST_F(CertDatabaseNSSTest, FLAKY_ImportCACertHierarchyDupeRoot) {
CertificateList certs;
ASSERT_TRUE(ReadCertIntoList("dod_root_ca_2_cert.der", &certs));
@@ -463,7 +463,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyUntrusted) {
EXPECT_EQ("DoD Root CA 2", cert_list[0]->subject().common_name);
}
-TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyTree) {
+TEST_F(CertDatabaseNSSTest, FLAKY_ImportCACertHierarchyTree) {
CertificateList certs;
ASSERT_TRUE(ReadCertIntoList("dod_root_ca_2_cert.der", &certs));
// This certificate is expired. http://crbug.com/111029