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

Unified Diff: net/base/nss_cert_database_unittest.cc

Issue 11196028: Revert 162327 - Implement ScopedTestNSSDB instead of OpenTestNSSDB() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | « crypto/nss_util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/nss_cert_database_unittest.cc
===================================================================
--- net/base/nss_cert_database_unittest.cc (revision 162509)
+++ net/base/nss_cert_database_unittest.cc (working copy)
@@ -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 @@
}
return ok;
}
-
- crypto::ScopedTestNSSDB test_nssdb_;
};
TEST_F(CertDatabaseNSSTest, ListCerts) {
« no previous file with comments | « crypto/nss_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698