fix blocking tests

Author: brotskydotcom

src/blocking/collection.rs

@@ -305,19 +305,23 @@ mod test {
         collection.lock().unwrap();
     }
 
-    #[tokio::test]
-    #[ignore]
-    async fn should_get_collection_by_path() {
-        let ss = crate::SecretService::connect(EncryptionType::Plain)
-            .await
-            .unwrap();
-        let collection = ss.get_default_collection().await.unwrap();
-        let label = collection.get_label().await.unwrap();
-
-        // get collection by path
-        let path = collection.collection_path.clone();
-        let collection_prime = ss.get_collection_by_path(path).await.unwrap();
-        let label_prime = collection_prime.get_label().await.unwrap();
-        assert_eq!(label, label_prime);
+    #[test]
+    fn should_get_collection_by_path() {
+        let path: OwnedObjectPath;
+        let label: String;
+        // get the default collection on one blocking call, remember its path and label
+        {
+            let ss = SecretService::connect(EncryptionType::Plain).unwrap();
+            let collection = ss.get_default_collection().unwrap();
+            label = collection.get_label().unwrap();
+            path = collection.collection_path.clone();
+        }
+        // get collection by path on another blocking call, check that the label is the same
+        {
+            let ss = SecretService::connect(EncryptionType::Plain).unwrap();
+            let collection_prime = ss.get_collection_by_path(path).unwrap();
+            let label_prime = collection_prime.get_label().unwrap();
+            assert_eq!(label, label_prime);
+        }
     }
 }

src/blocking/item.rs

@@ -213,24 +213,25 @@ mod test {
         item.delete().unwrap();
     }
 
-    #[tokio::test]
-    async fn should_get_item_by_path() {
-        let ss = SecretService::connect(EncryptionType::Plain).unwrap();
-        let collection = ss.get_default_collection().unwrap();
-        let item = create_test_default_item(&collection);
-
-        // Set label to test and check
-        item.set_label("Tester").unwrap();
-        let label = item.get_label().unwrap();
-        assert_eq!(label, "Tester");
-
-        // get item by path and check label
-        let path = item.item_path.clone();
-        let item_prime = ss.get_item_by_path(path).unwrap();
-        let label_prime = item_prime.get_label().unwrap();
-        assert_eq!(label_prime, label);
-
-        item.delete().unwrap();
+    #[test]
+    fn should_get_item_by_path() {
+        let path: OwnedObjectPath;
+        // first create the item on one blocking call, set its label, and get its path
+        {
+            let ss = SecretService::connect(EncryptionType::Plain).unwrap();
+            let collection = ss.get_default_collection().unwrap();
+            let item = create_test_default_item(&collection);
+            item.set_label("Tester").unwrap();
+            path = item.item_path.clone();
+        }
+        // now get the item by path on another blocking call, check its label, and delete it
+        {
+            let ss = SecretService::connect(EncryptionType::Plain).unwrap();
+            let item = ss.get_item_by_path(path).unwrap();
+            let label = item.get_label().unwrap();
+            assert_eq!(label, "Tester");
+            item.delete().unwrap();
+        }
     }
 
     #[test]