attempt at getting passing tests

Author: chris-olszewski

crates/turborepo-lib/src/run/watch.rs

@@ -218,7 +218,12 @@ impl WatchClient {
 
                 if let Some(changed_packages) = some_changed_packages {
                     // Clean up currently running tasks
-                    if let Some(RunHandle { stopper, run_task, persistent_exit }) = run_handle.take() {
+                    if let Some(RunHandle {
+                        stopper,
+                        run_task,
+                        persistent_exit,
+                    }) = run_handle.take()
+                    {
                         // Shut down the tasks for the run
                         stopper.stop().await;
                         // Run should exit shortly after we stop all child tasks, wait for it to
@@ -288,7 +293,10 @@ impl WatchClient {
         if let Some(sender) = &self.ui_sender {
             sender.stop().await;
         }
-        if let Some(RunHandle { stopper, run_task, .. }) = self.persistent_tasks_handle.take() {
+        if let Some(RunHandle {
+            stopper, run_task, ..
+        }) = self.persistent_tasks_handle.take()
+        {
             // Shut down the tasks for the run
             stopper.stop().await;
             // Run should exit shortly after we stop all child tasks, wait for it to finish
@@ -350,7 +358,7 @@ impl WatchClient {
                 Ok(RunHandle {
                     stopper: run.stopper(),
                     run_task: tokio::spawn(async move { run.run(ui_sender, true).await }),
-                    persistent_exit: None
+                    persistent_exit: None,
                 })
             }
             ChangedPackages::All => {
@@ -377,7 +385,12 @@ impl WatchClient {
                 self.watched_packages = self.run.get_relevant_packages();
 
                 // Clean up currently running persistent tasks
-                if let Some(RunHandle { stopper, run_task, persistent_exit }) = self.persistent_tasks_handle.take() {
+                if let Some(RunHandle {
+                    stopper,
+                    run_task,
+                    persistent_exit,
+                }) = self.persistent_tasks_handle.take()
+                {
                     // Shut down the tasks for the run
                     stopper.stop().await;
                     // Run should exit shortly after we stop all child tasks, wait for it to finish

turborepo-tests/integration/tests/watch/persistent-exit.t

@@ -6,9 +6,18 @@ Turbo should exit after dev script fails
   \xe2\x80\xa2 Packages in scope: web (esc)
   \xe2\x80\xa2 Running dev in 1 packages (esc)
   \xe2\x80\xa2 Remote caching disabled (esc)
-  \xe2\x80\xa2 Packages in scope: web (esc)
-  \xe2\x80\xa2 Running dev in 1 packages (esc)
-  \xe2\x80\xa2 Remote caching disabled (esc)
+  web:dev: cache bypass, force executing bfb830bdb7d49cb8
+  web:dev: 
+  web:dev: > dev
+  web:dev: > echo server crashed && exit 1
+  web:dev: 
+  web:dev: server crashed
+  web:dev: npm ERR! Lifecycle script `dev` failed with error: 
+  web:dev: npm ERR! Error: command failed 
+  web:dev: npm ERR!   in workspace: web 
+  web:dev: npm ERR!   at location: .* (re)
+  web:dev: ERROR: command finished with error: command .*npm(?:\.cmd)? run dev exited \(1\) (re)
+  web#dev: command .*npm(?:\.cmd)? run dev exited \(1\) (re)
   web:dev: cache bypass, force executing bfb830bdb7d49cb8
   web:dev: 
   web:dev: > dev