omdb tests

oxidecomputer · Jan 9, 2025 · f3144c3 · f3144c3
1 parent fb5cae9
commit f3144c3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git 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 <REDACTED_DURATION>s
+  configured period: every <REDACTED_DURATION>days <REDACTED_DURATION>h <REDACTED_DURATION>m <REDACTED_DURATION>s
   currently executing: no
   last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED_TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>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 <REDACTED_DURATION>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 <REDACTED_DURATION>s
+  configured period: every <REDACTED_DURATION>days <REDACTED_DURATION>h <REDACTED_DURATION>m <REDACTED_DURATION>s
   currently executing: no
   last completed activation: <REDACTED ITERATIONS>, triggered by a periodic timer firing
     started at <REDACTED_TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>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 <REDACTED_DURATION>s

diff --git 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, "<REDACTED_DURATION>m")
         .to_string();
 
+    // Replace interval (h).
+    let s = regex::Regex::new(r"\d+h")
+        .unwrap()
+        .replace_all(&s, "<REDACTED_DURATION>h")
+        .to_string();
+
+    // Replace interval (days).
+    let s = regex::Regex::new(r"\d+days")
+        .unwrap()
+        .replace_all(&s, "<REDACTED_DURATION>days")
+        .to_string();
+
     let s = regex::Regex::new(
         r"note: database schema version matches expected \(\d+\.\d+\.\d+\)",
     )