chore: replace tracing_test with test-log and don't init tracing manu…

…ally (#391) - running with tokio-console on could cause subscribers to register and conflict on the port. - tracing_test is only to assert log statements, not get debug tests like we want
ceramicnetwork · Jun 18, 2024 · cb2a7dd · cb2a7dd
1 parent 732d9d4
commit cb2a7dd
Show file tree

Hide file tree

Showing 17 changed files with 89 additions and 147 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -194,7 +194,6 @@ tracing-subscriber = { version = "0.3", features = [
     "env-filter",
     "json",
 ] }
-tracing-test = { version = "0.2" }
 trust-dns-resolver = "0.22.0"
 unsigned-varint = "0.8"
 url = "2.2.2"

diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -35,5 +35,5 @@ tikv-jemalloc-ctl.workspace = true
 
 [dev-dependencies]
 expect-test.workspace = true
-tracing-test.workspace = true
+test-log.workspace = true
 mockall.workspace = true
diff --git a/api/src/server/event.rs b/api/src/server/event.rs
@@ -129,7 +129,7 @@ mod tests {
     use async_trait::async_trait;
     use expect_test::{expect, Expect};
     use mockall::{mock, predicate};
-    use tracing_test::traced_test;
+    use test_log::test;
 
     async fn test_event_id_from_car(
         event_data: &str,
@@ -146,8 +146,7 @@ mod tests {
         expected_event_id.assert_debug_eq(&event_id);
     }
 
-    #[tokio::test]
-    #[traced_test]
+    #[test(tokio::test)]
     async fn event_id_from_car_signed_init_event() {
         let expected = expect![[r#"
             Ok(
@@ -175,8 +174,8 @@ mod tests {
         test_event_id_from_car(SIGNED_INIT_EVENT_CAR, expected, MockEventStoreTest::new()).await
     }
 
-    #[tokio::test]
-    #[traced_test]
+    #[test(tokio::test)]
+
     async fn event_id_from_car_unsigned_init_event() {
         let expected = expect![[r#"
             Ok(
@@ -210,8 +209,8 @@ mod tests {
         .await
     }
 
-    #[tokio::test]
-    #[traced_test]
+    #[test(tokio::test)]
+
     async fn event_id_from_car_data_event() {
         let expected = expect![[r#"
             Ok(
@@ -240,8 +239,8 @@ mod tests {
         test_event_id_from_car(DATA_EVENT_CAR, expected, mock_event_store).await
     }
 
-    #[tokio::test]
-    #[traced_test]
+    #[test(tokio::test)]
+
     async fn event_id_from_car_data_event_unsigned_init() {
         let expected = expect![[r#"
             Ok(
@@ -270,8 +269,8 @@ mod tests {
         test_event_id_from_car(DATA_EVENT_CAR_UNSIGNED_INIT, expected, mock_event_store).await
     }
 
-    #[tokio::test]
-    #[traced_test]
+    #[test(tokio::test)]
+
     async fn event_id_from_car_time_event() {
         let expected = expect![[r#"
             Ok(
@@ -300,8 +299,8 @@ mod tests {
         test_event_id_from_car(TIME_EVENT_CAR, expected, mock_event_store).await
     }
 
-    #[tokio::test]
-    #[traced_test]
+    #[test(tokio::test)]
+
     async fn event_id_from_car_data_event_missing() {
         let mut mock_store = MockEventStoreTest::new();
         mock_store

diff --git a/api/src/tests.rs b/api/src/tests.rs
@@ -21,7 +21,7 @@ use expect_test::expect;
 use mockall::{mock, predicate};
 use multibase::Base;
 use recon::Key;
-use tracing_test::traced_test;
+use test_log::test;
 
 struct Context;
 
@@ -165,7 +165,7 @@ pub fn mock_get_unsigned_init_event(mock_store: &mut MockEventStoreTest) {
         .return_once(move |_| Ok(Some(decode_multibase_str(UNSIGNED_INIT_EVENT_PAYLOAD))));
 }
 
-#[tokio::test]
+#[test(tokio::test)]
 async fn create_event() {
     let peer_id = PeerId::random();
     let network = Network::Mainnet;
@@ -201,8 +201,8 @@ async fn create_event() {
         .unwrap();
     assert!(matches!(resp, EventsPostResponse::Success));
 }
-#[tokio::test]
-#[traced_test]
+#[test(tokio::test)]
+
 async fn register_interest_sort_value() {
     let peer_id = PeerId::random();
     let network = Network::InMemory;
@@ -250,8 +250,8 @@ async fn register_interest_sort_value() {
     assert_eq!(resp, InterestsPostResponse::Success);
 }
 
-#[tokio::test]
-#[traced_test]
+#[test(tokio::test)]
+
 async fn register_interest_sort_value_bad_request() {
     let peer_id = PeerId::random();
     let network = Network::InMemory;
@@ -272,8 +272,8 @@ async fn register_interest_sort_value_bad_request() {
     assert!(matches!(resp, InterestsPostResponse::BadRequest(_)));
 }
 
-#[tokio::test]
-#[traced_test]
+#[test(tokio::test)]
+
 async fn register_interest_sort_value_controller() {
     let peer_id = PeerId::random();
     let network = Network::InMemory;
@@ -323,8 +323,8 @@ async fn register_interest_sort_value_controller() {
     assert_eq!(resp, InterestsSortKeySortValuePostResponse::Success);
 }
 
-#[tokio::test]
-#[traced_test]
+#[test(tokio::test)]
+
 async fn register_interest_value_controller_stream() {
     let peer_id = PeerId::random();
     let network = Network::InMemory;
@@ -375,7 +375,7 @@ async fn register_interest_value_controller_stream() {
     assert_eq!(resp, InterestsSortKeySortValuePostResponse::Success);
 }
 
-#[tokio::test]
+#[test(tokio::test)]
 async fn get_interests() {
     let peer_id = PeerId::from_str("1AaNXU5G2SJQSzCCP23V2TEDierSRBBGLA7aSCYScUTke9").unwrap();
     let network = Network::InMemory;
@@ -443,8 +443,8 @@ async fn get_interests() {
         )
     "#]].assert_debug_eq(&resp);
 }
-#[tokio::test]
-#[traced_test]
+#[test(tokio::test)]
+
 async fn get_events_for_interest_range() {
     let peer_id = PeerId::random();
     let network = Network::InMemory;
@@ -507,8 +507,7 @@ async fn get_events_for_interest_range() {
     );
 }
 
-#[tokio::test]
-#[traced_test]
+#[test(tokio::test)]
 async fn test_events_event_id_get_by_event_id_success() {
     let peer_id = PeerId::random();
     let network = Network::InMemory;
@@ -546,8 +545,8 @@ async fn test_events_event_id_get_by_event_id_success() {
     assert_eq!(event.data, event_data_base64);
 }
 
-#[tokio::test]
-#[traced_test]
+#[test(tokio::test)]
+
 async fn test_events_event_id_get_by_cid_success() {
     let peer_id = PeerId::random();
     let network = Network::InMemory;

diff --git a/event/src/unvalidated/builder.rs b/event/src/unvalidated/builder.rs
@@ -409,6 +409,7 @@ mod tests {
     use ipld_core::ipld;
     use ipld_core::ipld::Ipld;
     use multibase;
+    use test_log::test;
 
     use super::*;
     use crate::unvalidated::signed;
@@ -461,7 +462,7 @@ mod tests {
         assert_eq!(DATA_EVENT_PAYLOAD, dagcbor_str);
     }
 
-    #[tokio::test]
+    #[test(tokio::test)]
     async fn sign_init_payload() {
         let model =
             StreamId::from_str("kjzl6hvfrbw6c90uwoyz8j519gxma787qbsfjtrarkr1huq1g1s224k7hopvsyg")
@@ -500,7 +501,7 @@ mod tests {
         );
         assert_eq!(SIGNED_INIT_EVENT_CAR, event_car_str);
     }
-    #[tokio::test]
+    #[test(tokio::test)]
     async fn build_time_event() {
         let id = Cid::from_str(SIGNED_INIT_EVENT_CID).unwrap();
         let prev =

diff --git a/kubo-rpc/Cargo.toml b/kubo-rpc/Cargo.toml
@@ -41,7 +41,7 @@ go-parse-duration = "0.1.1"
 
 [dev-dependencies]
 expect-test.workspace = true
-tracing-test.workspace = true
+test-log.workspace = true
 mockall.workspace = true
 async-stream.workspace = true
 ipld-dagpb.workspace = true