Fix tests

rwx-research · Oct 4, 2024 · 0229502 · 0229502
1 parent f4a409e
commit 0229502
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/crates/abq_cli/src/workers.rs b/crates/abq_cli/src/workers.rs
@@ -178,11 +178,11 @@ async fn do_shutdown(
 
     let (suite_result, errors) = finalized_reporters.finish(&completed_summary);
 
-    if let WorkersExitStatus::Completed { .. } = status {
-        for error in errors {
-            eprintln!("{error}");
-        }
+    for error in errors {
+        eprintln!("{error}");
+    }
 
+    if matches!(status, WorkersExitStatus::Completed { .. }) || suite_result.count > 0 {
         print!("\n\n");
         suite_result
             .write_short_summary_lines(&mut stdout, ShortSummaryGrouping::Runner)

diff --git a/crates/abq_queue/src/queue.rs b/crates/abq_queue/src/queue.rs
@@ -291,6 +291,8 @@ enum ReadResultsError {
     RunNotFound,
     #[error("results cannot be read before manifest is received")]
     WaitingForManifest,
+    #[error("a manifest failed to be generated")]
+    ManifestNeverReceived,
     #[error("the run was cancelled before all test results were received")]
     RunCancelled,
 }
@@ -983,7 +985,11 @@ impl AllRuns {
                     }
                 }
             }
-            RunState::Cancelled { .. } => Err(RunCancelled),
+            RunState::Cancelled { reason } => match reason {
+                CancelReason::User => Err(RunCancelled),
+                CancelReason::ManifestHadNoProgress => Err(RunCancelled),
+                CancelReason::ManifestNeverReceived => Err(ManifestNeverReceived),
+            },
         }
     }
 

diff --git a/crates/abq_queue/tests/integration.rs b/crates/abq_queue/tests/integration.rs
@@ -1646,7 +1646,7 @@ async fn test_cancellation_drops_remaining_work() {
             [
                 WorkerExitStatus(
                     Wid(2),
-                    Box::new(|e| assert_eq!(e, &WorkersExitStatus::Completed(ExitCode::CANCELLED))),
+                    Box::new(|e| assert_eq!(e, &WorkersExitStatus::Error { errors: vec![String::from("Error: This ABQ run was cancelled. When an ABQ run is cancelled, it can no longer be retried. You must start a run with a new run ID instead.\nThis run was cancelled because a worker received a cancellation signal while still working on tests.")] })),
                 ),
                 QueueTestResults(
                     Run(1),
@@ -2335,7 +2335,7 @@ async fn cancellation_native() {
             ],
             [WorkerExitStatus(
                 Wid(2),
-                Box::new(|e| assert_eq!(e, &WorkersExitStatus::Completed(ExitCode::CANCELLED))),
+                Box::new(|e| assert_eq!(e, &WorkersExitStatus::Error { errors: vec![String::from("Error: This ABQ run was cancelled. When an ABQ run is cancelled, it can no longer be retried. You must start a run with a new run ID instead.\nThis run was cancelled because a worker received a cancellation signal while still working on tests.")] })),
             )],
         )
         .test()
@@ -2830,7 +2830,7 @@ async fn cancel_test_run_if_no_manifest_progress() {
             ],
             [WorkerExitStatus(
                 Wid(2),
-                Box::new(|e| assert_eq!(e, &WorkersExitStatus::Completed(ExitCode::CANCELLED))),
+                Box::new(|e| assert_eq!(e, &WorkersExitStatus::Error { errors: vec![String::from("Error: This ABQ run was cancelled. When an ABQ run is cancelled, it can no longer be retried. You must start a run with a new run ID instead.\nThis run was cancelled because the run timed out before any tests were completed.")] })),
             )],
         )
         .test()

diff --git a/crates/reporters/progress/src/lib.rs b/crates/reporters/progress/src/lib.rs
@@ -358,59 +358,59 @@ mod test {
         <bold>> ABQ status<reset>
         <bold>> [0 seconds] 1 tests run<reset>, <green-bold>1 passed<reset>, <reset>0 failing<reset>
 
-
+                                                                                                            
         <bold>> ABQ status<reset>
         <bold>> [0 seconds] 1 tests run<reset>, <green-bold>1 passed<reset>, <reset>0 failing<reset>
 
-
+                                                                                                            
         <bold>> ABQ status<reset>
         <bold>> [0 seconds] 1 tests run<reset>, <green-bold>1 passed<reset>, <reset>0 failing<reset>
 
-
+                                                                                                            
         <bold>> ABQ status<reset>
         <bold>> [0 seconds] 2 tests run<reset>, <green-bold>1 passed<reset>, <red-bold>1 failing<reset>
 
-
+                                                                                                            
         <bold>> ABQ status<reset>
         <bold>> [0 seconds] 2 tests run<reset>, <green-bold>1 passed<reset>, <red-bold>1 failing<reset>
 
-
+                                                                                                            
         <bold>> ABQ status<reset>
         <bold>> [0 seconds] 2 tests run<reset>, <green-bold>1 passed<reset>, <red-bold>1 failing<reset>
 
-
+                                                                                                            
         <bold>> ABQ status<reset>
         <bold>> [0 seconds] 3 tests run<reset>, <green-bold>2 passed<reset>, <red-bold>1 failing<reset>
 
-
+                                                                                                            
         <bold>> ABQ status<reset>
         <bold>> [0 seconds] 3 tests run<reset>, <green-bold>2 passed<reset>, <red-bold>1 failing<reset>
 
-
+                                                                                                            
         <bold>> ABQ status<reset>
         <bold>> [0 seconds] 3 tests run<reset>, <green-bold>2 passed<reset>, <red-bold>1 failing<reset>
 
-
+                                                                                                            
         <bold>> ABQ status<reset>
         <bold>> [0 seconds] 4 tests run<reset>, <green-bold>2 passed<reset>, <red-bold>2 failing<reset>
 
-
+                                                                                                            
         <bold>> ABQ status<reset>
         <bold>> [0 seconds] 4 tests run<reset>, <green-bold>2 passed<reset>, <red-bold>2 failing<reset>
 
-
+                                                                                                            
         <bold>> ABQ status<reset>
         <bold>> [0 seconds] 4 tests run<reset>, <green-bold>2 passed<reset>, <red-bold>2 failing<reset>
 
-
+                                                                                                            
         <bold>> ABQ status<reset>
         <bold>> [0 seconds] 5 tests run<reset>, <green-bold>3 passed<reset>, <red-bold>2 failing<reset>
 
-
+                                                                                                            
         <bold>> ABQ status<reset>
         <bold>> [0 seconds] 5 tests run<reset>, <green-bold>3 passed<reset>, <red-bold>2 failing<reset>
 
-
+                                                                                                            
         "###);
     }