Skip to content

Commit 898e94f

Browse files
committed
feat(json): Specify MessageKind to be in precedence order
1 parent a0b85b5 commit 898e94f

3 files changed

Lines changed: 6 additions & 10 deletions

File tree

crates/libtest-json/event.schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@
216216
"MessageKind": {
217217
"type": "string",
218218
"enum": [
219-
"ignored",
220-
"failed"
219+
"failed",
220+
"ignored"
221221
]
222222
},
223223
"CaseMessage": {

crates/libtest-json/src/event.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,13 +472,14 @@ impl RunMode {
472472
}
473473
}
474474

475-
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
475+
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
476476
#[cfg_attr(feature = "unstable-schema", derive(schemars::JsonSchema))]
477477
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
478478
#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
479479
pub enum MessageKind {
480-
Ignored,
480+
// Highest precedent items for determining test status last
481481
Failed,
482+
Ignored,
482483
}
483484

484485
impl MessageKind {

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,7 @@ impl super::Notifier for Summary {
145145
fn find_run_status(case_status: &CaseStatus) -> Option<MessageKind> {
146146
let mut status = None;
147147
for event in &case_status.messages {
148-
status = match (status, event.status) {
149-
(None, _) => Some(event.status),
150-
(Some(MessageKind::Ignored), _) => status,
151-
(_, MessageKind::Ignored) => Some(event.status),
152-
(Some(MessageKind::Failed), _) => status,
153-
}
148+
status = status.max(Some(event.status));
154149
}
155150
status
156151
}

0 commit comments

Comments
 (0)