Merge pull request #27 from josephlr/test

Have each test use its own keyring

Author: mathstuf

src/api.rs

@@ -804,13 +804,25 @@ impl KeyManager {
 
 #[cfg(test)]
 mod tests {
+    use std::sync::atomic;
     use std::thread;
 
     use super::*;
 
+    // For testing, each test gets a new keyring attached to the Thread keyring.
+    // This makes sure tests don't interfere with eachother, and keys are not
+    // prematurely garbage collected.
+    fn new_test_keyring() -> Result<Keyring> {
+        let mut thread_keyring = Keyring::attach_or_create(SpecialKeyring::Thread)?;
+
+        static KEYRING_COUNT: atomic::AtomicUsize = atomic::AtomicUsize::new(0);
+        let num = KEYRING_COUNT.fetch_add(1, atomic::Ordering::SeqCst);
+        thread_keyring.add_keyring(format!("test:rust-keyutils{}", num))
+    }
+
     #[test]
     fn test_add_key() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
 
         // Create the key.
         let description = "test:rust-keyutils:add_key";
@@ -830,7 +842,7 @@ mod tests {
 
     #[test]
     fn test_clear_keyring() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
 
         let (keys, keyrings) = keyring.read().unwrap();
         assert_eq!(keys.len(), 0);
@@ -862,7 +874,7 @@ mod tests {
 
     #[test]
     fn test_describe_key() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
 
         // Create the key.
         let desc = "test:rust-keyutils:describe_key";
@@ -883,7 +895,7 @@ mod tests {
 
     #[test]
     fn test_invalidate_key() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
 
         // Create the key.
         let description = "test:rust-keyutils:invalidate_key";
@@ -903,7 +915,7 @@ mod tests {
 
     #[test]
     fn test_link_key() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
         let mut new_keyring = keyring.add_keyring("new_keyring").unwrap();
 
         // Create the key.
@@ -928,7 +940,7 @@ mod tests {
 
     #[test]
     fn test_link_keyring() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
         let mut new_keyring = keyring.add_keyring("new_keyring").unwrap();
         let new_inner_keyring = keyring.add_keyring("new_inner_keyring").unwrap();
 
@@ -947,7 +959,7 @@ mod tests {
 
     #[test]
     fn test_read_keyring() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
 
         let (keys, keyrings) = keyring.read().unwrap();
         assert_eq!(keys.len(), 0);
@@ -972,7 +984,7 @@ mod tests {
 
     #[test]
     fn test_read_key() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
 
         // Create the key.
         let description = "test:rust-keyutils:read_key";
@@ -992,7 +1004,7 @@ mod tests {
 
     #[test]
     fn test_create_keyring() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
         let new_keyring = keyring.add_keyring("new_keyring").unwrap();
 
         let (keys, keyrings) = keyring.read().unwrap();
@@ -1007,7 +1019,7 @@ mod tests {
 
     #[test]
     fn test_chmod_keyring() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
         let description = keyring.description().unwrap();
         let perms = description.perms;
         let new_perms = {
@@ -1033,7 +1045,7 @@ mod tests {
 
     #[test]
     fn test_request_key() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
 
         // Create the key.
         let description = "test:rust-keyutils:request_key";
@@ -1054,7 +1066,7 @@ mod tests {
 
     #[test]
     fn test_revoke_key() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
 
         // Create the key.
         let description = "test:rust-keyutils:revoke_key";
@@ -1076,7 +1088,7 @@ mod tests {
 
     #[test]
     fn test_search_key() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
         let mut new_keyring = keyring.add_keyring("new_keyring").unwrap();
         let mut new_inner_keyring = new_keyring.add_keyring("new_inner_keyring").unwrap();
 
@@ -1101,7 +1113,7 @@ mod tests {
 
     #[test]
     fn test_search_keyring() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
         let mut new_keyring = keyring.add_keyring("new_keyring").unwrap();
         let new_inner_keyring = new_keyring.add_keyring("new_inner_keyring").unwrap();
 
@@ -1116,7 +1128,7 @@ mod tests {
 
     #[test]
     fn test_key_timeout() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
 
         // Create the key.
         let description = "test:rust-keyutils:key_timeout";
@@ -1144,7 +1156,7 @@ mod tests {
 
     #[test]
     fn test_unlink_keyring() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
 
         // Create the keyring.
         let description = "test:rust-keyutils:unlink_keyring";
@@ -1171,7 +1183,7 @@ mod tests {
 
     #[test]
     fn test_unlink_key() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
 
         // Create the key.
         let description = "test:rust-keyutils:unlink_key";
@@ -1201,7 +1213,7 @@ mod tests {
 
     #[test]
     fn test_update_key() {
-        let mut keyring = Keyring::attach_or_create(SpecialKeyring::Thread).unwrap();
+        let mut keyring = new_test_keyring().unwrap();
 
         // Create the key.
         let description = "test:rust-keyutils:update_key";