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

Unified Diff: chrome/browser/chromeos/cros/onc_network_parser_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 | « chrome/browser/chromeos/cros/network_library_unittest.cc ('k') | crypto/crypto_export.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
===================================================================
--- chrome/browser/chromeos/cros/onc_network_parser_unittest.cc (revision 162509)
+++ chrome/browser/chromeos/cros/onc_network_parser_unittest.cc (working copy)
@@ -54,9 +54,19 @@
class OncNetworkParserTest : public testing::Test {
public:
+ static void SetUpTestCase() {
+ // Ideally, we'd open a test DB for each test case, and close it
+ // again, removing the temp dir, but unfortunately, there's a
+ // bug in NSS that prevents this from working, so we just open
+ // it once, and empty it for each test case. Here's the bug:
+ // https://bugzilla.mozilla.org/show_bug.cgi?id=588269
+ 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());
-
slot_ = net::NSSCertDatabase::GetInstance()->GetPublicModule();
// Don't run the test if the setup failed.
@@ -127,7 +137,6 @@
}
ScopedStubCrosEnabler stub_cros_enabler_;
- crypto::ScopedTestNSSDB test_nssdb_;
};
const base::Value* OncNetworkParserTest::GetExpectedProperty(
« no previous file with comments | « chrome/browser/chromeos/cros/network_library_unittest.cc ('k') | crypto/crypto_export.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698