openpgp: Make test more robust.

  - If the primary key is created just before a second rollover, the
    subkeys are created at now+1, which means they won't be alive at
    now.

1 files changed, 8 insertions, 7 deletions

diff --git a/openpgp/src/cert/builder.rs b/openpgp/src/cert/builder.rs
index 393c2e6c..9e2a2899 100644
--- a/openpgp/src/cert/builder.rs
+++ b/openpgp/src/cert/builder.rs
@@ -647,23 +647,24 @@ mod tests {
                         None)
             .generate().unwrap();
 
-        let now = cert.primary().creation_time();
+        let now = cert.primary().creation_time()
+            + 5 * s; // The subkeys may be created a tad later.
         let key = cert.primary();
         let sig = cert.primary_key_signature(None).unwrap();
         assert!(sig.key_alive(key, now));
-        assert!(sig.key_alive(key, now + 599 * s));
-        assert!(! sig.key_alive(key, now + 601 * s));
+        assert!(sig.key_alive(key, now + 590 * s));
+        assert!(! sig.key_alive(key, now + 610 * s));
 
         let (sig, key) = cert.keys_valid().for_signing()
             .nth(0).map(|(s, _, k)| (s.unwrap(), k)).unwrap();
         assert!(sig.key_alive(key, now));
-        assert!(sig.key_alive(key, now + 299 * s));
-        assert!(! sig.key_alive(key, now + 301 * s));
+        assert!(sig.key_alive(key, now + 290 * s));
+        assert!(! sig.key_alive(key, now + 310 * s));
 
         let (sig, key) = cert.keys_valid().for_authentication()
             .nth(0).map(|(s, _, k)| (s.unwrap(), k)).unwrap();
         assert!(sig.key_alive(key, now));
-        assert!(sig.key_alive(key, now + 599 * s));
-        assert!(! sig.key_alive(key, now + 601 * s));
+        assert!(sig.key_alive(key, now + 590 * s));
+        assert!(! sig.key_alive(key, now + 610 * s));
     }
 }