diff --git a/dev-tools/omdb/tests/successes.out b/dev-tools/omdb/tests/successes.out index 742ed1e840..6c3b69f265 100644 --- a/dev-tools/omdb/tests/successes.out +++ b/dev-tools/omdb/tests/successes.out @@ -698,11 +698,11 @@ task: "service_zone_nat_tracker" last completion reported error: inventory collection is None task: "support_bundle_collector" - configured period: every s + configured period: every days h m s currently executing: no last completed activation: , triggered by a periodic timer firing started at (s ago) and ran for ms - last completion reported error: task disabled +warning: unknown background task: "support_bundle_collector" (don't know how to interpret details: Object {"cleanup_err": Null, "cleanup_report": Object {"db_destroying_bundles_removed": Number(0), "db_failing_bundles_updated": Number(0), "sled_bundles_delete_failed": Number(0), "sled_bundles_deleted_not_found": Number(0), "sled_bundles_deleted_ok": Number(0)}, "collection_err": Null, "collection_report": Null}) task: "switch_port_config_manager" configured period: every s @@ -1150,11 +1150,11 @@ task: "service_zone_nat_tracker" last completion reported error: inventory collection is None task: "support_bundle_collector" - configured period: every s + configured period: every days h m s currently executing: no last completed activation: , triggered by a periodic timer firing started at (s ago) and ran for ms - last completion reported error: task disabled +warning: unknown background task: "support_bundle_collector" (don't know how to interpret details: Object {"cleanup_err": Null, "cleanup_report": Object {"db_destroying_bundles_removed": Number(0), "db_failing_bundles_updated": Number(0), "sled_bundles_delete_failed": Number(0), "sled_bundles_deleted_not_found": Number(0), "sled_bundles_deleted_ok": Number(0)}, "collection_err": Null, "collection_report": Null}) task: "switch_port_config_manager" configured period: every s diff --git a/test-utils/src/dev/test_cmds.rs b/test-utils/src/dev/test_cmds.rs index 220efa4628..d2662abb1c 100644 --- a/test-utils/src/dev/test_cmds.rs +++ b/test-utils/src/dev/test_cmds.rs @@ -257,6 +257,18 @@ fn redact_basic(input: &str) -> String { .replace_all(&s, "m") .to_string(); + // Replace interval (h). + let s = regex::Regex::new(r"\d+h") + .unwrap() + .replace_all(&s, "h") + .to_string(); + + // Replace interval (days). + let s = regex::Regex::new(r"\d+days") + .unwrap() + .replace_all(&s, "days") + .to_string(); + let s = regex::Regex::new( r"note: database schema version matches expected \(\d+\.\d+\.\d+\)", )