tweak some tests

HaHa421 · Mar 28, 2024 · 5c8ad8c · 5c8ad8c
1 parent daaf0d4
commit 5c8ad8c
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 18 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -177,7 +177,11 @@ async fn init_rxqlite<P>(
     base_dir: P,
     instance_params: InstanceParams,
     is_test_node: bool,
-) -> anyhow::Result<(Arc<App>, tokio::task::JoinHandle<()>)>
+) -> anyhow::Result<
+  (
+    Arc<App>, 
+    tokio::task::JoinHandle<()>,
+  )>
 where
     P: AsRef<Path>,
 {
@@ -298,9 +302,10 @@ where
         let notifications_addr = instance_params.notifications_addr.clone();
 
         let _ = task::spawn(async move {
-            notifications::start_notification_server_tls(notifications_addr, notification_config,is_test_node)
-                .await
-                .unwrap();
+            if let Err(err) = notifications::start_notification_server_tls(notifications_addr, notification_config,is_test_node)
+                .await {
+              tracing::error!("Notification server error: {}",err);
+            }
         });
 
         let config_builder: ConfigBuilder<ServerConfig, WantsServerCert> = ServerConfig::builder()
@@ -327,18 +332,22 @@ where
         //let listener = TcpListener::bind(instance_params.rpc_addr.clone()).await?;
 
         let handle = task::spawn(async move {
-            let _= server
-                .accept_with_tls_config(listener, config)
-                .await;
+
+            if let Err(err) = server
+              .accept_with_tls_config(listener, config)
+              .await {
+                tracing::error!("Toy rpc error: {}",err);
+            }
         });
         handle
     } else {
         let notifications_addr = instance_params.notifications_addr.clone();
 
         let _ = task::spawn(async move {
-            notifications::start_notification_server(notifications_addr,is_test_node)
-                .await
-                .unwrap();
+            if let Err(err) = notifications::start_notification_server(notifications_addr,is_test_node)
+              .await {
+              tracing::error!("Notification server error: {}",err);
+            }
         });
 
         server_builder = server_builder.register(echo_service);
@@ -359,7 +368,12 @@ where
         //let listener = TcpListener::bind(instance_params.rpc_addr.clone()).await?;
 
         let handle = task::spawn(async move {
-            let _=server.accept_websocket(listener).await;
+
+          if let Err(err) = server
+            .accept_websocket(listener)
+            .await {
+              tracing::error!("Toy rpc error: {}",err);
+            }
         });
         handle
     };
@@ -602,6 +616,7 @@ where
 
     tokio::select! {
       _ = handle => {
+
       }
       _ = signal::ctrl_c() => {
         //std::process::exit(0);

diff --git a/src/tests/consts.rs b/src/tests/consts.rs
@@ -5,5 +5,8 @@ pub const DELAY_BETWEEN_KILL_AND_START: tokio::time::Duration= tokio::time::Dura
 pub const DELAY_BETWEEN_LEADER_VACATION_RETRIES: tokio::time::Duration = 
   tokio::time::Duration::from_secs(1);
 
-pub const LEADER_VACATION_RETRIES: usize = 5;
+pub const LEADER_VACATION_RETRIES: usize = 10;
 
+pub const NOTIFICATIONS_READ_TIMEOUT: tokio::time::Duration= tokio::time::Duration::from_secs(120);
+
+pub const WAIT_FOR_LAST_APPLIED_LOG_SECS: usize= 120;
diff --git a/src/tests/notifications.rs b/src/tests/notifications.rs
@@ -8,6 +8,9 @@ use sqlx_sqlite_cipher::notifications::{Action, Notification};
 #[cfg(target_os = "linux")]
 use super::consts::DELAY_BETWEEN_KILL_AND_START;
 */
+
+use super::consts::NOTIFICATIONS_READ_TIMEOUT;
+
 use super::consts::{LEADER_VACATION_RETRIES,DELAY_BETWEEN_LEADER_VACATION_RETRIES};
 
 fn do_notifications(test_name: &str,
@@ -70,7 +73,7 @@ fn do_notifications(test_name: &str,
 
         let notification_stream = client.notification_stream.as_mut().unwrap();
         let message = notification_stream
-            .read_timeout(tokio::time::Duration::from_secs(60))
+            .read_timeout(NOTIFICATIONS_READ_TIMEOUT)
             .await
             .unwrap();
         assert!(message.is_some());
@@ -102,7 +105,7 @@ fn do_notifications(test_name: &str,
         }
         let notification_stream = client.notification_stream.as_mut().unwrap();
         let message = notification_stream
-            .read_timeout(tokio::time::Duration::from_secs(60))
+            .read_timeout(NOTIFICATIONS_READ_TIMEOUT)
             .await
             .unwrap();
         assert!(message.is_some());
@@ -190,7 +193,7 @@ fn do_notifications2(test_name: &str,
 
           let notification_stream = client.notification_stream.as_mut().unwrap();
           let message = notification_stream
-              .read_timeout(tokio::time::Duration::from_secs(60))
+              .read_timeout(NOTIFICATIONS_READ_TIMEOUT)
               .await
               .unwrap();
           assert!(message.is_some());
@@ -222,7 +225,7 @@ fn do_notifications2(test_name: &str,
           }
           let notification_stream = client.notification_stream.as_mut().unwrap();
           let message = notification_stream
-              .read_timeout(tokio::time::Duration::from_secs(60))
+              .read_timeout(NOTIFICATIONS_READ_TIMEOUT)
               .await
               .unwrap();
           assert!(message.is_some());

diff --git a/src/tests/queries.rs b/src/tests/queries.rs
@@ -9,7 +9,10 @@ use ring::digest;
 use std::fs::File;
 use std::io::BufReader;
 
-use super::consts::{LEADER_VACATION_RETRIES,DELAY_BETWEEN_LEADER_VACATION_RETRIES};
+use super::consts::{
+  LEADER_VACATION_RETRIES,
+  DELAY_BETWEEN_LEADER_VACATION_RETRIES,
+  WAIT_FOR_LAST_APPLIED_LOG_SECS};
 
 fn do_simple_query(test_name: &str, tls_config: Option<TestTlsConfig>) {
     let rt = Runtime::new().unwrap();
@@ -56,7 +59,7 @@ fn do_simple_query(test_name: &str, tls_config: Option<TestTlsConfig>) {
             MessageResponse::Error(err) => panic!("{}", err),
         }
 
-        tm.wait_for_last_applied_log(response.log_id, 60)
+        tm.wait_for_last_applied_log(response.log_id, WAIT_FOR_LAST_APPLIED_LOG_SECS)
             .await
             .unwrap();