diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-25 17:42:23 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-25 17:42:23 +0000 |
| commit | c05960ea782363a8d9c68967309839cfcb51d424 (patch) | |
| tree | 60abdf12770a554f9c0e152904f2ce52c48eba71 /chromeos | |
| parent | 32a93e0c1ac080239558a2ff6a499857d144571f (diff) | |
| download | chromium_src-c05960ea782363a8d9c68967309839cfcb51d424.zip chromium_src-c05960ea782363a8d9c68967309839cfcb51d424.tar.gz chromium_src-c05960ea782363a8d9c68967309839cfcb51d424.tar.bz2 | |
Destroy all Singletons and LazyInstances between each test.
This modifies base::TestSuite to add a test listener that runs the AtExitManager
between each test.
BUG=110594, 156433, 238654
TEST=*unit*tests
R=apatrick@chromium.org, gspencer@chromium.org, phajdan.jr@chromium.org, pneubeck@chromium.org, rsleevi@chromium.org
Review URL: https://codereview.chromium.org/8947021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/network/onc/onc_certificate_importer_unittest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chromeos/network/onc/onc_certificate_importer_unittest.cc b/chromeos/network/onc/onc_certificate_importer_unittest.cc index 1fbb633..fba0871f 100644 --- a/chromeos/network/onc/onc_certificate_importer_unittest.cc +++ b/chromeos/network/onc/onc_certificate_importer_unittest.cc @@ -12,6 +12,7 @@ #include "base/logging.h" #include "base/string_number_conversions.h" +#include "base/threading/platform_thread.h" #include "base/values.h" #include "chromeos/network/onc/onc_constants.h" #include "chromeos/network/onc/onc_test_utils.h" @@ -80,6 +81,10 @@ class ONCCertificateImporterTest : public testing::Test { void AddCertificatesFromFile( std::string filename, CertificateImporter::ParseResult expected_parse_result) { + // This 1 second sleep is necessary because NSS has a caching bug. This + // can be removed once http://crbug.com/238654 is fixed. + base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1)); + scoped_ptr<base::DictionaryValue> onc = test_utils::ReadTestDictionary(filename); base::Value* certificates_value = NULL; |