diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 20:32:38 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 20:32:38 +0000 |
| commit | c6474b523c69db39103e8b20d8b26486f33078ed (patch) | |
| tree | 7542bcc596af5715f2027fcfa1866610c42d2474 /net/base | |
| parent | c02c059cb0e72fb303bf19fb18380ae704a26854 (diff) | |
| download | chromium_src-c6474b523c69db39103e8b20d8b26486f33078ed.zip chromium_src-c6474b523c69db39103e8b20d8b26486f33078ed.tar.gz chromium_src-c6474b523c69db39103e8b20d8b26486f33078ed.tar.bz2 | |
Revert 162327 - Implement ScopedTestNSSDB instead of OpenTestNSSDB()
BUG=136950
Review URL: https://chromiumcodereview.appspot.com/11174006
TBR=toyoshim@chromium.org
BUG=156433
Review URL: https://codereview.chromium.org/11196028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/nss_cert_database_unittest.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/net/base/nss_cert_database_unittest.cc b/net/base/nss_cert_database_unittest.cc index 9cdbb95..2a99196 100644 --- a/net/base/nss_cert_database_unittest.cc +++ b/net/base/nss_cert_database_unittest.cc @@ -38,10 +38,20 @@ namespace net { +// TODO(mattm): when https://bugzilla.mozilla.org/show_bug.cgi?id=588269 is +// fixed, switch back to using a separate userdb for each test. +// (When doing so, remember to add some standalone tests of DeleteCert since it +// won't be tested by TearDown anymore.) class CertDatabaseNSSTest : public testing::Test { public: + static void SetUpTestCase() { + ASSERT_TRUE(crypto::OpenTestNSSDB()); + // There is no matching TearDownTestCase call to close the test NSS DB + // because that would leave NSS in a potentially broken state for further + // tests, due to https://bugzilla.mozilla.org/show_bug.cgi?id=588269 + } + virtual void SetUp() { - ASSERT_TRUE(test_nssdb_.is_open()); cert_db_ = NSSCertDatabase::GetInstance(); slot_ = cert_db_->GetPublicModule(); @@ -119,8 +129,6 @@ class CertDatabaseNSSTest : public testing::Test { } return ok; } - - crypto::ScopedTestNSSDB test_nssdb_; }; TEST_F(CertDatabaseNSSTest, ListCerts) { |