Destroy all Singletons and LazyInstances between each test.

crypto/nss_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "crypto/nss_util.h"
 #include "crypto/nss_util_internal.h"
 
 #include <nss.h>
 #include <pk11pub.h>
 #include <plarena.h>
@@ skipping 338 matching lines @@
 
   done:
     if (slot)
       PK11_FreeSlot(slot);
 
     return key ? SymmetricKey::CreateFromKey(key) : NULL;
   }
 #endif  // defined(OS_CHROMEOS)
 
 
   bool OpenTestNSSDB() {

[Ryan Sleevi, 2013/05/22 19:50:59]

I'm not fully sure I understood - is this a failure on linux, linux_chromeos, or
on real ChromeOS bots?

I suspect that the failure of the test is a side-effect of your changes on
749/750, and wholly independent of the particular test being run. That is, I
expect a variety of NSS tests to possibly fail *if* it's the timing issue I
think it is.

The timing issue I think it is comes from the 1 second constant in
http://mxr.mozilla.org/nss/source/lib/dev/devslot.c#17 , which is used by
http://mxr.mozilla.org/nss/source/lib/dev/devslot.c#102 attempting to avoid
polling hardware devices quicker than 1 second.

Because of how NSS's SECMOD DBs (that is, the filesystem-backed sqlite DB we're
using here on line 364) work, we simulate as if we're a hardware slot, thus I
suspect you're hitting that timer and it's not polling to see if the 'card' is
still present before it tries to use it.

A workaround, of sorts, that avoids the sleep, would be to try the following
modifications:

[Robert Sesek, 2013/05/23 16:55:16]

This is a failure on Linux with GYP_DEFINES=chromeos=1.
I tried the UserEnable workaround, but it still results in these ONC tests
failing :/

     if (test_slot_)
       return true;
     if (!g_test_nss_db_dir.Get().CreateUniqueTempDir())
       return false;
     test_slot_ = OpenUserDB(g_test_nss_db_dir.Get().path(), "Test DB");

[Ryan Sleevi, 2013/05/22 19:50:59]

if (test_slot_)
  PK11_UserEnableSlot(test_slot_);

     return !!test_slot_;
   }
 
   void CloseTestNSSDB() {
     if (test_slot_) {

[Ryan Sleevi, 2013/05/22 19:50:59]

if (!test_slot_)
  return;

PK11_UserDisableSlot(test_slot_);
SECStatus status = SECMOD_CloseUserDB(test_slot_);
...


If this doesn't work, then the sleep(1) call really belongs here, since it will
take up to 1 second before the state is 'fully' undone (that is, before NSS will
flush it's cache and attempt to re-query the "hardware")

       SECStatus status = SECMOD_CloseUserDB(test_slot_);
       if (status != SECSuccess)
         PLOG(ERROR) << "SECMOD_CloseUserDB failed: " << PORT_GetError();
       PK11_FreeSlot(test_slot_);
       test_slot_ = NULL;
       ignore_result(g_test_nss_db_dir.Get().Delete());
     }
   }
 
   PK11SlotInfo* GetPublicNSSKeySlot() {
@@ skipping 359 matching lines @@
 bool CheckNSSVersion(const char* version) {
   return !!NSS_VersionCheck(version);
 }
 
 #if defined(USE_NSS)
 ScopedTestNSSDB::ScopedTestNSSDB()
   : is_open_(g_nss_singleton.Get().OpenTestNSSDB()) {
 }
 
 ScopedTestNSSDB::~ScopedTestNSSDB() {
-  // TODO(mattm): Close the dababase once NSS 3.14 is required,
-  // which fixes https://bugzilla.mozilla.org/show_bug.cgi?id=588269
-  // Resource leaks are suppressed. http://crbug.com/156433 .
+  if (NSS_VersionCheck("3.14"))
+    g_nss_singleton.Get().CloseTestNSSDB();
 }
 
 base::Lock* GetNSSWriteLock() {
   return g_nss_singleton.Get().write_lock();
 }
 
 AutoNSSWriteLock::AutoNSSWriteLock() : lock_(GetNSSWriteLock()) {
   // May be NULL if the lock is not needed in our version of NSS.
   if (lock_)
     lock_->Acquire();
@@ skipping 55 matching lines @@
 
 PK11SlotInfo* GetPublicNSSKeySlot() {
   return g_nss_singleton.Get().GetPublicNSSKeySlot();
 }
 
 PK11SlotInfo* GetPrivateNSSKeySlot() {
   return g_nss_singleton.Get().GetPrivateNSSKeySlot();
 }
 
 }  // namespace crypto