1
0

2 Commits c448196ffc ... af1f3eb6ad

Autor SHA1 Nachricht Datum
  Jing Yang af1f3eb6ad Hard code test name in tokio tests. vor 3 Jahren
  Jing Yang 721185df85 Fix the log name conflict in persist_tests.rs. vor 3 Jahren
2 geänderte Dateien mit 11 neuen und 7 gelöschten Zeilen
  1. 7 4
      tests/persist_tests.rs
  2. 4 3
      tests/regression_tests.rs

+ 7 - 4
tests/persist_tests.rs

@@ -301,9 +301,12 @@ fn figure8_unreliable() -> config::Result<()> {
     Ok(())
 }
 
-fn internal_churn(unreliable: bool) -> config::Result<()> {
+fn internal_churn(
+    unreliable: bool,
+    test_name: &'static str,
+) -> config::Result<()> {
     const SERVERS: usize = 5;
-    let cfg = Arc::new(make_config!(SERVERS, false));
+    let cfg = Arc::new(config::make_config(SERVERS, false, test_name));
     defer!(cfg.cleanup());
 
     if unreliable {
@@ -422,10 +425,10 @@ fn internal_churn(unreliable: bool) -> config::Result<()> {
 
 #[test]
 fn reliable_churn() -> config::Result<()> {
-    internal_churn(false)
+    internal_churn(false, stdext::function_name!())
 }
 
 #[test]
 fn unreliable_churn() -> config::Result<()> {
-    internal_churn(true)
+    internal_churn(true, stdext::function_name!())
 }

+ 4 - 3
tests/regression_tests.rs

@@ -5,11 +5,11 @@ use ruaft::utils::integration_test::{
     unpack_append_entries_args, unpack_append_entries_reply,
 };
 use test_configs::interceptor::{make_config, RaftRpcEvent};
-use test_utils::init_test_log;
 
 #[tokio::test(flavor = "multi_thread")]
 async fn smoke_test() {
-    init_test_log!();
+    test_utils::init_log("regression_tests-smoke_test")
+        .expect("Initializing test log should never fail");
     let server_count = 3;
     let config = make_config(server_count, None);
     let config = Arc::new(config);
@@ -56,7 +56,8 @@ async fn smoke_test() {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn delayed_commit_consistency_test() {
-    init_test_log!();
+    test_utils::init_log("regression_tests-delayed_commit_consistency_test")
+        .expect("Initializing test log should never fail");
     let server_count = 3;
     let config = Arc::new(make_config(server_count, None));