[nextest-runner] show TRY n START for retries with --verbose (#2847)

Similar to the START added for --verbose, show `TRY n START` for
retries.

Author: sunshowers

nextest-runner/src/reporter/displayer/imp.rs

@@ -765,27 +765,28 @@ impl<'a> DisplayReporterImpl<'a> {
             TestEventKind::TestRetryStarted {
                 stress_index,
                 test_instance,
-                retry_data:
-                    RetryData {
-                        attempt,
-                        total_attempts,
-                    },
+                retry_data: RetryData { attempt, .. },
                 running: _,
+                command_line,
             } => {
-                let retry_string = format!("RETRY {attempt}/{total_attempts}");
-                write!(writer, "{:>12} ", retry_string.style(self.styles.retry))?;
+                // In no-capture and verbose modes, print out a retry start event.
+                if self.no_capture || self.verbose {
+                    let retry_string = format!("TRY {attempt} START");
+                    writeln!(
+                        writer,
+                        "{:>12} [         ] {}",
+                        retry_string.style(self.styles.retry),
+                        self.display_test_instance(
+                            *stress_index,
+                            TestInstanceCounter::Padded,
+                            *test_instance
+                        )
+                    )?;
+                }
 
-                // Add spacing to align test instances, then print the name of the test.
-                writeln!(
-                    writer,
-                    "[{:<9}] {}",
-                    "",
-                    self.display_test_instance(
-                        *stress_index,
-                        TestInstanceCounter::Padded,
-                        *test_instance
-                    )
-                )?;
+                if self.verbose {
+                    self.write_command_line(command_line, writer)?;
+                }
             }
             TestEventKind::TestFinished {
                 stress_index,
@@ -3271,6 +3272,56 @@ mod tests {
                         },
                     })
                     .unwrap();
+
+                // Test a retry (attempt 2) - should show "TRY 2 START".
+                reporter
+                    .write_event(&TestEvent {
+                        timestamp: Local::now().into(),
+                        elapsed: Duration::ZERO,
+                        kind: TestEventKind::TestRetryStarted {
+                            stress_index: None,
+                            test_instance: TestInstanceId {
+                                binary_id: &binary_id,
+                                test_name: "test_retry",
+                            },
+                            retry_data: RetryData {
+                                attempt: 2,
+                                total_attempts: 3,
+                            },
+                            running: 1,
+                            command_line: vec![
+                                "/path/to/binary".to_string(),
+                                "--exact".to_string(),
+                                "test_retry".to_string(),
+                            ],
+                        },
+                    })
+                    .unwrap();
+
+                // Test a retry (attempt 3) - should show "TRY 3 START".
+                reporter
+                    .write_event(&TestEvent {
+                        timestamp: Local::now().into(),
+                        elapsed: Duration::ZERO,
+                        kind: TestEventKind::TestRetryStarted {
+                            stress_index: None,
+                            test_instance: TestInstanceId {
+                                binary_id: &binary_id,
+                                test_name: "test_retry",
+                            },
+                            retry_data: RetryData {
+                                attempt: 3,
+                                total_attempts: 3,
+                            },
+                            running: 1,
+                            command_line: vec![
+                                "/path/to/binary".to_string(),
+                                "--exact".to_string(),
+                                "test_retry".to_string(),
+                            ],
+                        },
+                    })
+                    .unwrap();
             },
             &mut out,
         );

nextest-runner/src/reporter/displayer/snapshots/nextest_runner__reporter__displayer__imp__tests__verbose_command_line.snap

@@ -9,3 +9,7 @@ snapshot_kind: text
              command: /path/to/binary --exact 'test with spaces' '--flag=value'
        START [         ] ( 1/10) my-binary-id test_special_chars
              command: /path/to/binary 'test"with"quotes' 'test'\''with'\''single'
+ TRY 2 START [         ] (─────────) my-binary-id test_retry
+             command: /path/to/binary --exact test_retry
+ TRY 3 START [         ] (─────────) my-binary-id test_retry
+             command: /path/to/binary --exact test_retry

nextest-runner/src/reporter/events.rs

@@ -230,6 +230,9 @@ pub enum TestEventKind<'a> {
 
         /// The current number of running tests.
         running: usize,
+
+        /// The command line that will be used to run this test.
+        command_line: Vec<String>,
     },
 
     /// A test finished running.

nextest-runner/src/runner/dispatcher.rs

@@ -737,6 +737,7 @@ where
                 stress_index,
                 test_instance,
                 retry_data,
+                command_line,
                 tx,
             }) => {
                 if self.run_stats.cancel_reason.is_some() {
@@ -759,6 +760,7 @@ where
                     test_instance: test_instance.id(),
                     retry_data,
                     running: self.running_tests.len(),
+                    command_line,
                 })
             }
             InternalEvent::Executor(ExecutorEvent::Finished {

nextest-runner/src/runner/executor.rs

@@ -231,7 +231,7 @@ impl<'a> ExecutorContext<'a> {
         _ = resp_tx.send(ExecutorEvent::Started {
             stress_index,
             test_instance: test.instance,
-            command_line,
+            command_line: command_line.clone(),
             req_rx_tx,
         });
         let mut req_rx = match req_rx_rx.await {
@@ -262,6 +262,7 @@ impl<'a> ExecutorContext<'a> {
                     stress_index,
                     test_instance: test.instance,
                     retry_data,
+                    command_line: command_line.clone(),
                     tx,
                 });
 

nextest-runner/src/runner/internal_events.rs

@@ -100,6 +100,7 @@ pub(super) enum ExecutorEvent<'a> {
         stress_index: Option<StressIndex>,
         test_instance: TestInstance<'a>,
         retry_data: RetryData,
+        command_line: Vec<String>,
         // This is used to indicate that the dispatcher still wants to run the test.
         tx: oneshot::Sender<()>,
     },