fix(json)!: Rename MessageKind::Failed to Error

Author: epage

crates/libtest-json/event.schema.json

@@ -216,7 +216,7 @@
     "MessageKind": {
       "type": "string",
       "enum": [
-        "failed",
+        "error",
         "ignored"
       ]
     },

crates/libtest-json/src/event.rs

@@ -481,14 +481,14 @@ impl RunMode {
 #[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
 pub enum MessageKind {
     // Highest precedent items for determining test status last
-    Failed,
+    Error,
     Ignored,
 }
 
 impl MessageKind {
     pub fn as_str(&self) -> &str {
         match self {
-            Self::Failed => "failed",
+            Self::Error => "error",
             Self::Ignored => "ignored",
         }
     }

crates/libtest-json/tests/roundtrip.rs

@@ -106,11 +106,11 @@ fn case_message() {
     t(
         libtest_json::event::CaseMessage {
             name: "Hello\tworld!".to_owned(),
-            kind: libtest_json::MessageKind::Failed,
+            kind: libtest_json::MessageKind::Error,
             message: None,
             elapsed_s: None,
         },
-        str![[r#"{"event":"case_message","name":"Hello\tworld!","kind":"failed"}"#]],
+        str![[r#"{"event":"case_message","name":"Hello\tworld!","kind":"error"}"#]],
     );
 
     t(
@@ -120,7 +120,9 @@ fn case_message() {
             message: Some("This\tfailed".to_owned()),
             elapsed_s: Some(libtest_json::Elapsed(Default::default())),
         },
-        str![[r#"{"event":"case_message","name":"Hello\tworld!","kind":"ignored","message":"This\tfailed","elapsed_s":"0"}"#]],
+        str![[
+            r#"{"event":"case_message","name":"Hello\tworld!","kind":"ignored","message":"This\tfailed","elapsed_s":"0"}"#
+        ]],
     );
 }
 

crates/libtest2-harness/src/case.rs

@@ -60,7 +60,7 @@ pub struct RunError {
 impl RunError {
     pub fn with_cause(cause: impl std::error::Error + Send + Sync + 'static) -> Self {
         Self {
-            status: notify::MessageKind::Failed,
+            status: notify::MessageKind::Error,
             cause: Some(Box::new(cause)),
         }
     }

crates/libtest2-harness/src/harness.rs

@@ -317,7 +317,7 @@ fn run(
                 notifier: &mut dyn notify::Notifier,
             ) -> std::io::Result<()> {
                 if self.join_handle.join().is_err() {
-                    let kind = notify::MessageKind::Failed;
+                    let kind = notify::MessageKind::Error;
                     let message = Some("panicked after reporting success".to_owned());
                     notifier.notify(
                         notify::event::CaseMessage {
@@ -485,7 +485,7 @@ fn run_case(
         .into(),
     )?;
 
-    Ok(case_status != Some(notify::MessageKind::Failed))
+    Ok(case_status != Some(notify::MessageKind::Error))
 }
 
 /// Fixed frame used to clean the backtrace with `RUST_BACKTRACE=1`.

crates/libtest2-harness/src/notify/pretty.rs

@@ -56,7 +56,7 @@ impl<W: std::io::Write> super::Notifier for PrettyRunNotifier<W> {
                 let status = self.summary.get_kind(&inner.name);
                 let (s, style) = match status {
                     Some(MessageKind::Ignored) => ("ignored", IGNORED),
-                    Some(MessageKind::Failed) => ("FAILED", FAILED),
+                    Some(MessageKind::Error) => ("FAILED", FAILED),
                     None => ("ok", OK),
                 };
 

crates/libtest2-harness/src/notify/summary.rs

@@ -38,17 +38,17 @@ impl Summary {
             let mut status = find_run_status(case_status);
             if !case_status.started {
                 // Even override `Ignored`
-                status = Some(MessageKind::Failed);
+                status = Some(MessageKind::Error);
                 failures.insert(name, Some("test found that never started"));
             }
             if !case_status.completed {
                 // Even override `Ignored`
-                status = Some(MessageKind::Failed);
+                status = Some(MessageKind::Error);
                 failures.insert(name, Some("test never completed"));
             }
             match status {
                 Some(MessageKind::Ignored) => num_ignored += 1,
-                Some(MessageKind::Failed) => {
+                Some(MessageKind::Error) => {
                     num_failed += 1;
                     for event in &case_status.messages {
                         if Some(event.kind) == status {

crates/libtest2-harness/src/notify/terse.rs

@@ -74,7 +74,7 @@ impl<W: std::io::Write> super::Notifier for TerseRunNotifier<W> {
                 let status = self.summary.get_kind(&inner.name);
                 let (c, style) = match status {
                     Some(MessageKind::Ignored) => ('i', IGNORED),
-                    Some(MessageKind::Failed) => ('F', FAILED),
+                    Some(MessageKind::Error) => ('F', FAILED),
                     None => ('.', OK),
                 };
                 write!(self.writer, "{style}{c}{style:#}")?;

crates/libtest2-mimic/tests/testsuite/mixed_bag.rs

@@ -1213,7 +1213,7 @@ fn fail_fast_json() {
   {
     "event": "case_message",
     "name": "dog",
-    "kind": "failed",
+    "kind": "error",
     "message": "was not a good boy",
     "elapsed_s": "[..]"
   },

crates/libtest2/tests/testsuite/mixed_bag.rs

@@ -1220,7 +1220,7 @@ fn fail_fast_json() {
   {
     "event": "case_message",
     "name": "dog",
-    "kind": "failed",
+    "kind": "error",
     "message": "was not a good boy",
     "elapsed_s": "[..]"
   },