tests: loop on EACCES while waiting for keyring collection

src/tests/invalidate.rs

@@ -116,7 +116,7 @@ fn invalidate_keyring() {
     let keyring_observer = keyring.clone();
 
     keyring.invalidate().unwrap();
-    utils::wait_for_keyring_gc_read(&keyring_observer);
+    utils::wait_for_keyring_gc(&keyring_observer);
 
     let err = keyring_observer.read().unwrap_err();
     assert_eq!(err, errno::Errno(libc::ENOKEY));

src/tests/newring.rs

@@ -103,7 +103,7 @@ fn duplicate_keyring_names() {
     assert_eq!(1, keyrings.len());
     assert_eq!(new_keyring2, keyrings[0]);
 
-    utils::wait_for_keyring_gc_description(&new_keyring1);
+    utils::wait_for_keyring_gc(&new_keyring1);
 
     // It should be inaccessible.
     let err = new_keyring1.description().unwrap_err();

src/tests/utils/mod.rs

@@ -79,25 +79,10 @@ pub fn wait_for_key_gc(key: &Key) {
 
 /// Keys are deleted asynchronously; describing the key succeeds until it has been garbage
 /// collected.
-pub fn wait_for_keyring_gc_read(keyring: &Keyring) {
+pub fn wait_for_keyring_gc(keyring: &Keyring) {
     loop {
         match keyring.read() {
-            Ok(_) => (),
-            Err(errno::Errno(libc::ENOKEY)) => break,
-            e @ Err(_) => {
-                e.unwrap();
-                unreachable!()
-            },
-        }
-    }
-}
-
-/// Keys are deleted asynchronously; describing the key succeeds until it has been garbage
-/// collected.
-pub fn wait_for_keyring_gc_description(keyring: &Keyring) {
-    loop {
-        match keyring.description() {
-            Ok(_) => (),
+            Ok(_) | Err(errno::Errno(libc::EACCES)) => (),
             Err(errno::Errno(libc::ENOKEY)) => break,
             e @ Err(_) => {
                 e.unwrap();