test: move some slow tests to ignore, to speed up default tests

dignifiedquire · dignifiedquire · commit 7d16c1c835c2 · 2025-01-04T15:02:55.000+01:00
diff --git a/src/composed/key/builder.rs b/src/composed/key/builder.rs
@@ -771,6 +771,7 @@ mod tests {
     }
 
     #[test]
+    #[ignore]
     fn key_gen_ecdsa_p384() {
         let mut rng = &mut ChaCha8Rng::seed_from_u64(0);
 
@@ -784,6 +785,7 @@ mod tests {
     }
 
     #[test]
+    #[ignore]
     fn key_gen_ecdsa_p521() {
         let mut rng = &mut ChaCha8Rng::seed_from_u64(0);
 
diff --git a/src/crypto/ecdh.rs b/src/crypto/ecdh.rs
@@ -539,6 +539,7 @@ mod tests {
     use crate::{Deserializable, Message, SignedSecretKey};
 
     #[test]
+    #[ignore]
     fn test_encrypt_decrypt() {
         for curve in [
             ECCCurve::Curve25519,
diff --git a/tests/key_test.rs b/tests/key_test.rs
@@ -31,6 +31,8 @@ use pgp::types::{
 };
 use pgp::{armor, types::PublicKeyTrait};
 use rand::thread_rng;
+use rand::SeedableRng;
+use rand_chacha::ChaChaRng;
 use rsa::{
     traits::{PrivateKeyParts, PublicKeyParts},
     RsaPrivateKey, RsaPublicKey,
@@ -1286,6 +1288,7 @@ fn test_keyid_formatters() {
 fn test_encrypted_key() {
     let p = Path::new("./tests/key-with-password-123.asc");
     let mut file = read_file(p.to_path_buf());
+    let mut rng = ChaChaRng::from_seed([0u8; 32]);
 
     let mut buf = vec![];
     file.read_to_end(&mut buf).unwrap();
@@ -1296,16 +1299,14 @@ fn test_encrypted_key() {
     let unsigned_pubkey = key.public_key();
 
     // Incorrect password results in InvalidInput error.
-    assert!(matches!(
-        unsigned_pubkey
-            .clone()
-            .sign(&mut thread_rng(), &key, || "".into())
-            .err()
-            .unwrap(),
-        pgp::errors::Error::InvalidInput
-    ));
+    let res = unsigned_pubkey
+        .clone()
+        .sign(&mut rng, &key, || "".into())
+        .err()
+        .unwrap();
 
+    assert!(matches!(res, pgp::errors::Error::InvalidInput));
     let _signed_key = unsigned_pubkey
-        .sign(&mut thread_rng(), &key, || "123".into())
+        .sign(&mut rng, &key, || "123".into())
         .unwrap();
 }

Original file line number	Diff line number	Diff line change
`@@ -771,6 +771,7 @@ mod tests {`
`771`	`771`	`}`
`772`	`772`
`773`	`773`	`#[test]`
	`774`	`+ #[ignore]`
`774`	`775`	`fn key_gen_ecdsa_p384() {`
`775`	`776`	`let mut rng = &mut ChaCha8Rng::seed_from_u64(0);`
`776`	`777`
`@@ -784,6 +785,7 @@ mod tests {`
`784`	`785`	`}`
`785`	`786`
`786`	`787`	`#[test]`
	`788`	`+ #[ignore]`
`787`	`789`	`fn key_gen_ecdsa_p521() {`
`788`	`790`	`let mut rng = &mut ChaCha8Rng::seed_from_u64(0);`
`789`	`791`