Merge pull request #138 from iamjpotts/20230922-refactor-async-testcase

Refactor async test cases to use actix macro

Author: ferristseng

ipfs-api/tests/test_basic_auth.rs

@@ -11,16 +11,12 @@ mod test_support;
 use test_support::client::{build_client, wait_for_server};
 use test_support::container::{IpfsContainer, NginxContainer};
 use test_support::images;
-use test_support::rt::run_async;
 
 use ipfs_api_versions::test_current_image;
 
 #[test_current_image]
-fn test_basic_auth(image_name: &str, image_tag: &str) {
-    run_async(run_test(image_name, image_tag));
-}
-
-async fn run_test(image_name: &str, image_tag: &str) {
+#[actix_rt::test]
+async fn test_basic_auth(image_name: &str, image_tag: &str) {
     let expected_version = images::extract_version(image_tag);
 
     let container = IpfsContainer::new("test_basic_auth_ipfs", image_name, image_tag)

ipfs-api/tests/test_get_version.rs

@@ -11,16 +11,12 @@ mod test_support;
 use test_support::client::{build_client, wait_for_server};
 use test_support::container::IpfsContainer;
 use test_support::images;
-use test_support::rt::run_async;
 
 use ipfs_api_versions::test_supported_images;
 
 #[test_supported_images]
-fn test_get_version(image_name: &str, image_tag: &str) {
-    run_async(run_test(image_name, image_tag));
-}
-
-async fn run_test(image_name: &str, image_tag: &str) {
+#[actix_rt::test]
+async fn test_get_version(image_name: &str, image_tag: &str) {
     let expected_version = images::extract_version(image_tag);
 
     let container_name = format!("test_get_version_{}", expected_version.replace('.', "-"));

ipfs-api/tests/test_support/lib.rs

@@ -14,4 +14,3 @@ pub mod client;
 pub mod container;
 pub mod errors;
 pub mod images;
-pub mod rt;