refactor

akiradeveloper · May 24, 2024 · 0a7bf91 · 0a7bf91
1 parent 525389d
commit 0a7bf91
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 22 deletions.
diff --git a/tests/env/tests/tests.rs b/tests/env/tests/tests.rs
@@ -1,24 +1,23 @@
 use anyhow::Result;
 use serial_test::serial;
-use test_log::test;
 
 #[serial]
-#[test(tokio::test)]
+#[tokio::test]
 async fn connect_docker_daemon() -> Result<()> {
     let _e = env::Env::new()?;
     Ok(())
 }
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn create() -> Result<()> {
     let mut env = env::Env::new()?;
     env.create(0, 1).await?;
     Ok(())
 }
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn start_stop() -> Result<()> {
     let mut env = env::Env::new()?;
     env.create(0, 1).await?;

diff --git a/tests/lol-tests/tests/n10_tests.rs b/tests/lol-tests/tests/n10_tests.rs
@@ -1,10 +1,9 @@
 use anyhow::Result;
 use lol_tests::*;
 use serial_test::serial;
-use test_log::test;
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn n10_cluster() -> Result<()> {
     let mut cluster = Cluster::new(10, 1).await?;
     cluster.add_server(0, 0, 0).await?;
@@ -15,7 +14,7 @@ async fn n10_cluster() -> Result<()> {
 }
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn n10_write() -> Result<()> {
     let mut cluster = Cluster::new(10, 1).await?;
     cluster.add_server(0, 0, 0).await?;

diff --git a/tests/lol-tests/tests/n1_tests.rs b/tests/lol-tests/tests/n1_tests.rs
@@ -1,10 +1,9 @@
 use anyhow::Result;
 use lol_tests::*;
 use serial_test::serial;
-use test_log::test;
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn n1_cluster() -> Result<()> {
     let mut cluster = Cluster::new(1, 1).await?;
     cluster.add_server(0, 0, 0).await?;
@@ -13,7 +12,7 @@ async fn n1_cluster() -> Result<()> {
 }
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn n1_write() -> Result<()> {
     let mut cluster = Cluster::new(1, 1).await?;
     cluster.add_server(0, 0, 0).await?;
@@ -27,7 +26,7 @@ async fn n1_write() -> Result<()> {
 }
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn n1_read() -> Result<()> {
     let mut cluster = Cluster::new(1, 1).await?;
     cluster.add_server(0, 0, 0).await?;
@@ -43,7 +42,7 @@ async fn n1_read() -> Result<()> {
 }
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn n1_snapshot() -> Result<()> {
     let mut cluster = Cluster::new(1, 1).await?;
     cluster.add_server(0, 0, 0).await?;
@@ -62,7 +61,7 @@ async fn n1_snapshot() -> Result<()> {
 }
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn n1_exec_once() -> Result<()> {
     let mut cluster = Cluster::new(1, 1).await?;
     cluster.add_server(0, 0, 0).await?;

diff --git a/tests/lol-tests/tests/n3_tests.rs b/tests/lol-tests/tests/n3_tests.rs
@@ -1,10 +1,9 @@
 use anyhow::Result;
 use lol_tests::*;
 use serial_test::serial;
-use test_log::test;
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn n3_cluster() -> Result<()> {
     let mut cluster = Cluster::new(3, 1).await?;
     cluster.add_server(0, 0, 0).await?;
@@ -14,7 +13,7 @@ async fn n3_cluster() -> Result<()> {
 }
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn n3_write() -> Result<()> {
     let mut cluster = Cluster::new(3, 1).await?;
     cluster.add_server(0, 0, 0).await?;
@@ -30,7 +29,7 @@ async fn n3_write() -> Result<()> {
 }
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn n3_snapshot() -> Result<()> {
     let mut cluster = Cluster::new(3, 1).await?;
     cluster.add_server(0, 0, 0).await?;
@@ -50,7 +49,7 @@ async fn n3_snapshot() -> Result<()> {
 }
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn n3_leader_stop() -> Result<()> {
     let mut cluster = Cluster::new(3, 1).await?;
     cluster.add_server(0, 0, 0).await?;
@@ -73,7 +72,7 @@ async fn n3_leader_stop() -> Result<()> {
 }
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn n3_leader_stepdown() -> Result<()> {
     let mut cluster = Cluster::new(3, 1).await?;
     cluster.add_server(0, 0, 0).await?;
@@ -97,7 +96,7 @@ async fn n3_leader_stepdown() -> Result<()> {
 }
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn n3_down2_err() -> Result<()> {
     let mut cluster = Cluster::new(3, 1).await?;
     cluster.add_server(0, 0, 0).await?;

diff --git a/tests/lol-tests/tests/reflection_tests.rs b/tests/lol-tests/tests/reflection_tests.rs
@@ -1,10 +1,9 @@
 use anyhow::Result;
 use lol_tests::*;
 use serial_test::serial;
-use test_log::test;
 
 #[serial]
-#[test(tokio::test(flavor = "multi_thread"))]
+#[tokio::test(flavor = "multi_thread")]
 async fn reflection_grpcurl_access() -> Result<()> {
     let _cluster = Cluster::new(1, 1).await?;