Fix more nss initialization issues in tests

Author: moztcampbell

components/autofill/src/sync/credit_card/mod.rs

@@ -255,6 +255,7 @@ fn test_last_4() {
 
 #[test]
 fn test_to_from_payload() {
+    nss::ensure_initialized();
     let key = crate::encryption::create_autofill_key().unwrap();
     let cc_number = "1234567812345678";
     let cc_number_enc =

components/support/rc_crypto/src/contentsignature.rs

@@ -157,7 +157,6 @@ pub fn verify(
 #[cfg(test)]
 mod test {
     use super::*;
-    use nss::ensure_initialized;
 
     const ROOT_HASH: &str = "3C:01:44:6A:BE:90:36:CE:A9:A0:9A:CA:A3:A5:20:AC:62:8F:20:A7:AE:32:CE:86:1C:B2:EF:B7:0F:A0:C7:45";
     const VALID_CERT_CHAIN: &[u8] = b"\
@@ -284,7 +283,7 @@ IKdcFKAt3fFrpyMhlfIKkLfmm0iDjmfmIXbDGBJw9SE=
 
     #[test]
     fn test_decode_root_hash() {
-        ensure_initialized();
+        nss::ensure_initialized();
         assert!(decode_root_hash("meh!").is_err());
         assert!(decode_root_hash("3C:rr:44").is_err());
 
@@ -331,6 +330,7 @@ BAUG
 
     #[test]
     fn test_verify_fails_if_invalid() {
+        nss::ensure_initialized();
         assert!(verify(
             b"msg",
             b"sig",
@@ -346,6 +346,7 @@ fdfeff
 
     #[test]
     fn test_verify_fails_if_cert_has_expired() {
+        nss::ensure_initialized();
         assert!(verify(
             VALID_INPUT,
             VALID_SIGNATURE,
@@ -359,6 +360,7 @@ fdfeff
 
     #[test]
     fn test_verify_fails_if_bad_certificate_chain() {
+        nss::ensure_initialized();
         assert!(verify(
             VALID_INPUT,
             VALID_SIGNATURE,
@@ -372,6 +374,7 @@ fdfeff
 
     #[test]
     fn test_verify_fails_if_mismatch() {
+        nss::ensure_initialized();
         assert!(verify(
             b"msg",
             VALID_SIGNATURE,
@@ -385,6 +388,7 @@ fdfeff
 
     #[test]
     fn test_verify_fails_if_bad_hostname() {
+        nss::ensure_initialized();
         assert!(verify(
             VALID_INPUT,
             VALID_SIGNATURE,
@@ -398,6 +402,7 @@ fdfeff
 
     #[test]
     fn test_verify_fails_if_bad_root_hash() {
+        nss::ensure_initialized();
         assert!(verify(
             VALID_INPUT,
             VALID_SIGNATURE,
@@ -411,6 +416,7 @@ fdfeff
 
     #[test]
     fn test_verify_succeeds_if_valid() {
+        nss::ensure_initialized();
         verify(
             VALID_INPUT,
             VALID_SIGNATURE,

components/support/rc_crypto/src/digest.rs

@@ -60,6 +60,7 @@ mod tests {
 
     #[test]
     fn sha256_digest() {
+        nss::ensure_initialized();
         assert_eq!(hex::encode(digest(&SHA256, MESSAGE).unwrap()), DIGEST_HEX);
         assert_ne!(
             hex::encode(digest(&SHA256, b"notbobo").unwrap()),
@@ -69,6 +70,7 @@ mod tests {
 
     #[test]
     fn digest_cleanly_rejects_gigantic_messages() {
+        nss::ensure_initialized();
         let message = vec![0; (i32::MAX as usize) + 1];
         assert!(digest(&SHA256, &message).is_err());
     }

components/support/rc_crypto/src/ece_crypto.rs

@@ -181,6 +181,7 @@ mod tests {
 
     #[test]
     fn test_cryptographer_backend() {
+        nss::ensure_initialized();
         crate::ensure_initialized();
         ece::crypto::test_cryptographer(RcCryptoCryptographer);
     }

components/support/rc_crypto/src/hawk_crypto.rs

@@ -93,6 +93,7 @@ mod test {
     // Based on rust-hawk's hash_consistency. This fails if we've messed up the hashing.
     #[test]
     fn test_hawk_hashing() {
+        nss::ensure_initialized();
         crate::ensure_initialized();
 
         let mut hasher1 = hawk::PayloadHasher::new("text/plain", hawk::SHA256).unwrap();
@@ -124,6 +125,7 @@ mod test {
     // Based on rust-hawk's test_make_mac. This fails if we've messed up the signing.
     #[test]
     fn test_hawk_signing() {
+        nss::ensure_initialized();
         crate::ensure_initialized();
 
         let key = hawk::Key::new(