fix: rid flakiness of integration tests

Author: nyannyacha

crates/base/src/commands.rs

@@ -16,6 +16,7 @@ pub async fn start_server(
     user_worker_policy: Option<WorkerPoolPolicy>,
     import_map_path: Option<String>,
     no_module_cache: bool,
+    no_signal_handler: bool,
     callback_tx: Option<Sender<ServerCodes>>,
     entrypoints: WorkerEntrypoints,
 ) -> Result<(), Error> {
@@ -34,6 +35,7 @@ pub async fn start_server(
         user_worker_policy,
         import_map_path,
         no_module_cache,
+        no_signal_handler,
         callback_tx,
         entrypoints,
     )

crates/base/src/macros/test_macros.rs

@@ -27,6 +27,7 @@ macro_rules! integration_test {
                 None,
                 None,
                 false,
+                true,
                 Some(tx.clone()),
                 $crate::server::WorkerEntrypoints {
                     main: None,

crates/base/src/rt_worker/supervisor/strategy_per_worker.rs

@@ -24,7 +24,7 @@ pub async fn supervise(args: Arguments) -> ShutdownReason {
         req: (_, mut req_end_rx),
     } = timing.unwrap_or_default();
 
-    let is_retired = is_retired.unwrap();
+    let is_retired = is_retired.unwrap_or_default();
 
     let mut cpu_time_soft_limit_reached = false;
     let mut wall_clock_alerts = 0;

crates/base/src/rt_worker/worker_ctx.rs

@@ -122,7 +122,7 @@ pub fn create_supervisor(
         let (cpu_alarms_tx, cpu_alarms_rx) = mpsc::unbounded_channel::<()>();
 
         (
-            if !cfg!(test) && conf.cpu_time_soft_limit_ms != 0 && conf.cpu_time_hard_limit_ms != 0 {
+            if conf.cpu_time_soft_limit_ms != 0 && conf.cpu_time_hard_limit_ms != 0 {
                 Some(CPUTimer::start(
                     if supervisor_policy.is_per_worker() {
                         conf.cpu_time_soft_limit_ms
@@ -174,12 +174,11 @@ pub fn create_supervisor(
             }
         };
 
-        if !cfg!(test) {
-            // NOTE: It's not a big deal in unit testing because it is nothing
-            // but sending just a message to the pooler that it is the user
-            // worker going disposed down and will not accept awaiting
-            // subsequent requests and they must be re-polled again.
-            cancel.as_ref().unwrap().notify_waiters();
+        // NOTE: Sending a signal to the pooler that it is the user worker going
+        // disposed down and will not accept awaiting subsequent requests, so
+        // they must be re-polled again.
+        if let Some(cancel) = cancel.as_ref() {
+            cancel.notify_waiters();
         }
 
         // NOTE: If we issue a hard CPU time limit, It's OK because it is

crates/base/src/server.rs

@@ -171,6 +171,7 @@ impl Server {
         maybe_user_worker_policy: Option<WorkerPoolPolicy>,
         import_map_path: Option<String>,
         no_module_cache: bool,
+        no_signal_handler: bool,
         callback_tx: Option<Sender<ServerCodes>>,
         entrypoints: WorkerEntrypoints,
     ) -> Result<Self, Error> {
@@ -212,7 +213,7 @@ impl Server {
         )
         .await?;
 
-        if !cfg!(test) {
+        if !no_signal_handler {
             // register alarm signal handler
             cpu_timer::register_alarm()?;
         }

crates/cli/src/main.rs

@@ -167,6 +167,7 @@ fn main() -> Result<(), anyhow::Error> {
                     )),
                     import_map_path,
                     no_module_cache,
+                    cfg!(not(target_os = "linux")),
                     None,
                     WorkerEntrypoints {
                         main: maybe_main_entrypoint,