Bump test-log to 0.2.18

Author: kezhuw

Cargo.toml

@@ -81,7 +81,7 @@ env_logger = "0.11.5"
 serial_test = "2.0.0"
 speculoos = "0.11.0"
 test-case = "3.1.0"
-test-log = "0.2.12"
+test-log = "0.2.18"
 testcontainers = "0.14.0"
 tracing-test = "0.2.4"
 

src/cluster/etcd.rs

@@ -150,7 +150,8 @@ pub mod tests {
         EtcdContainer { container: unsafe { std::mem::transmute(etcd) } }
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn test_etcd_lease() {
         let etcd = etcd_container();

src/cluster/meta.rs

@@ -859,15 +859,17 @@ mod tests {
     };
     use crate::utils::{self, DropOwner, WatchConsumer as _};
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     #[should_panic(expected = "cluster deployment not found")]
     async fn test_cluster_deployment_watcher_not_found() {
         let etcd = etcd_container();
         ClusterDeploymentWatcher::new(etcd.uri(), Some(Duration::from_secs(2))).await.unwrap();
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn test_cluster_deployment_watcher_update() {
         let etcd = etcd_container();
@@ -889,7 +891,8 @@ mod tests {
         }
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn test_cluster_deployment_watcher_deleted() {
         let etcd = etcd_container();
@@ -1012,7 +1015,8 @@ mod tests {
         }
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn test_cluster_meta_deploy() {
         let etcd = etcd_container();

src/cluster/node.rs

@@ -338,7 +338,8 @@ mod tests {
     use crate::cluster::{EtcdNodeRegistry, NodeId, NodeStatistics};
     use crate::endpoint::*;
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn test_etcd_node_registry() {
         let etcd = etcd_container();

src/log/fs.rs

@@ -299,7 +299,8 @@ mod tests {
         assert_eq!(buf.as_slice(), format!("{first_line}{second_line}").as_bytes());
     }
 
-    #[test_log::test(tokio::test(flavor = "multi_thread"))]
+    #[tokio::test(flavor = "multi_thread")]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn log_based_file() {
         let kafka = KafkaContainer::new();

src/log/kafka.rs

@@ -432,7 +432,8 @@ pub mod tests {
     // There are request timeouts in case of current_thread scheduler.
     // I guess there are blocking operations in async context. But after
     // bumping both tokio and rdkafka, the phenomenon still exists.
-    #[test_log::test(tokio::test(flavor = "multi_thread"))]
+    #[tokio::test(flavor = "multi_thread")]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn test_kafka_basic() {
         let kafka = KafkaContainer::new();

src/sql/mod.rs

@@ -170,7 +170,8 @@ mod tests {
     use crate::sql::context::SqlContext;
     use crate::tablet::{TabletClient, TabletNode};
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn query() {
         let etcd = etcd_container();

src/tablet/client.rs

@@ -1230,7 +1230,8 @@ mod tests {
     };
     use crate::tablet::{TabletClient, TabletNode};
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn test_tablet_client_basic() {
         let etcd = etcd_container();
@@ -1287,7 +1288,8 @@ mod tests {
         assert_that!(client.find(b"kz").await.unwrap().is_none()).is_true();
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn test_tablet_client_batch() {
         let etcd = etcd_container();
@@ -1368,7 +1370,8 @@ mod tests {
         assert_that!(get.value.unwrap()).is_equal_to(&expect_value);
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn test_tablet_client_find_timestamped() {
         let etcd = etcd_container();
@@ -1416,7 +1419,8 @@ mod tests {
         assert_that!(find1.value.unwrap().value).is_equal_to(Value::Int(10));
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn test_tablet_client_scan_timestamped() {
         let etcd = etcd_container();
@@ -1472,7 +1476,8 @@ mod tests {
         assert_that!(scan.rows[1].value).is_equal_to(Value::Int(10));
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn test_tablet_client_scan_transactional() {
         let etcd = etcd_container();
@@ -1544,7 +1549,8 @@ mod tests {
         assert_that!(scan.rows[1].value).is_equal_to(Value::Int(10));
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn tablet_client_transactional_read_your_write() {
         let etcd = etcd_container();
@@ -1605,7 +1611,8 @@ mod tests {
         assert_eq!(get.value.unwrap().value, Value::Int(5));
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn tablet_client_transactional_once() {
         let etcd = etcd_container();
@@ -1661,7 +1668,8 @@ mod tests {
         assert_eq!(value, Value::String("v1_1".to_owned()));
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn tablet_client_transactional_stepped() {
         let etcd = etcd_container();
@@ -1763,7 +1771,8 @@ mod tests {
         }
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn tablet_client_transactional_resolve_committed() {
         let etcd = etcd_container();
@@ -1894,7 +1903,8 @@ mod tests {
         }
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn tablet_client_transactional_resolve_aborted() {
         let etcd = etcd_container();
@@ -2024,7 +2034,8 @@ mod tests {
         }
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn tablet_client_transactional_timeout_aborted() {
         let etcd = etcd_container();
@@ -2122,7 +2133,8 @@ mod tests {
         }
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn tablet_client_transactional_refresh_read() {
         let etcd = etcd_container();
@@ -2269,7 +2281,8 @@ mod tests {
         assert_that!(status.message()).contains("conflict with write to key");
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn tablet_client_transactional_deadlock() {
         let etcd = etcd_container();
@@ -2436,7 +2449,8 @@ mod tests {
         assert_eq!(value, Value::Int(50));
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn tablet_client_write_beneath_closed_timestamp() {
         let etcd = etcd_container();
@@ -2488,7 +2502,8 @@ mod tests {
         assert_that!(response.into_put().unwrap().write_ts).is_equal_to(written_ts);
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn tablet_client_timestamped_write_push_forward() {
         let etcd = etcd_container();
@@ -2601,7 +2616,8 @@ mod tests {
         assert_that!(response.into_put().unwrap().write_ts).is_equal_to(written_ts);
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn tablet_client_transactional_write_push_forward() {
         let etcd = etcd_container();
@@ -2698,7 +2714,8 @@ mod tests {
         assert_that!(read_value.timestamp).is_equal_to(written_ts);
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn tablet_client_transactional_commit_push_forward() {
         let etcd = etcd_container();

src/tablet/mod.rs

@@ -137,7 +137,8 @@ mod tests {
         (cluster_meta_handle, node, client)
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn tablet_compact_files() {
         let etcd = etcd_container();

src/txn.rs

@@ -642,7 +642,8 @@ mod tests {
     use crate::protos::{HasTxnMeta, TxnStatus, Value};
     use crate::tablet::{TabletClient, TabletNode};
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn txn_write_multiple() {
         let etcd = etcd_container();
@@ -681,7 +682,8 @@ mod tests {
             .is_equal_to((commit_ts, Value::Int(100)));
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn txn_write_push_forward() {
         let etcd = etcd_container();
@@ -721,7 +723,8 @@ mod tests {
         assert_that!(read_value).is_equal_to(Value::Int(1));
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn txn_read_refresh() {
         let etcd = etcd_container();
@@ -769,7 +772,8 @@ mod tests {
         assert_that!(value).is_equal_to(tablet_id_value);
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn txn_read_refresh_scan() {
         let etcd = etcd_container();
@@ -820,7 +824,8 @@ mod tests {
         assert_eq!(sum, 110);
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn txn_commit_push_forward() {
         let etcd = etcd_container();
@@ -856,7 +861,8 @@ mod tests {
         assert_that!(txn.wrapped().txn().commit_ts()).is_greater_than(commit_ts);
     }
 
-    #[test_log::test(tokio::test)]
+    #[tokio::test]
+    #[test_log::test]
     #[tracing_test::traced_test]
     async fn txn_abort() {
         let etcd = etcd_container();