From b02b5f4b14681ea3fd980f2f79c5efd08cf07372 Mon Sep 17 00:00:00 2001
From: ppom <reaction@ppom.me>
Date: Sun, 5 Oct 2025 12:00:00 +0200
Subject: [PATCH] Fix tests

---
 src/concepts/action.rs     |  4 ++--
 src/concepts/stream.rs     |  4 ++--
 src/daemon/filter/tests.rs | 21 ++++++++++++++-------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/concepts/action.rs b/src/concepts/action.rs
index 0252df6..70a89bc 100644
--- a/src/concepts/action.rs
+++ b/src/concepts/action.rs
@@ -43,9 +43,9 @@ pub struct Action {
     pub stream_name: String,
 
     // Plugin-specific
-    #[serde(default, rename = "type")]
+    #[serde(default, rename = "type", skip_serializing_if = "Option::is_none")]
     pub action_type: Option<String>,
-    #[serde(default = "null_value")]
+    #[serde(default = "null_value", skip_serializing_if = "Value::is_null")]
     pub options: Value,
 }
 
diff --git a/src/concepts/stream.rs b/src/concepts/stream.rs
index 40c78d0..84bea87 100644
--- a/src/concepts/stream.rs
+++ b/src/concepts/stream.rs
@@ -19,9 +19,9 @@ pub struct Stream {
     pub name: String,
 
     // Plugin-specific
-    #[serde(default, rename = "type")]
+    #[serde(default, rename = "type", skip_serializing_if = "Option::is_none")]
     pub stream_type: Option<String>,
-    #[serde(default = "null_value")]
+    #[serde(default = "null_value", skip_serializing_if = "Value::is_null")]
     pub options: Value,
 }
 
diff --git a/src/daemon/filter/tests.rs b/src/daemon/filter/tests.rs
index baccfd0..0deb880 100644
--- a/src/daemon/filter/tests.rs
+++ b/src/daemon/filter/tests.rs
@@ -16,7 +16,7 @@ use super::{
 };
 use crate::{
     concepts::{Action, Duplicate, Filter, Pattern, Patterns, Time},
-    daemon::shutdown::ShutdownController,
+    daemon::{plugin::Plugins, shutdown::ShutdownController},
     tests::TempDatabase,
 };
 
@@ -89,7 +89,7 @@ impl TestBed {
         };
         let controller = ShutdownController::new();
         let semaphore = Arc::new(Semaphore::new(1));
-        TestBed2 {
+        let test_bed2 = TestBed2 {
             _out_path: self._out_path,
             out_file: self.out_file,
             az_patterns: self.az_patterns,
@@ -100,12 +100,15 @@ impl TestBed {
                 Some(semaphore.clone()),
                 controller.token(),
                 &mut db,
+                &mut Plugins::default(),
                 now,
             )
             .await
             .unwrap(),
             semaphore,
-        }
+        };
+        test_bed2.manager.start(now).await;
+        test_bed2
     }
 }
 
@@ -435,7 +438,8 @@ async fn one_db_match_one_runtime_match_one_action() {
         let db = TempDatabase::from_loaded_db(HashMap::from([(
             filter_ordered_times_db_name(filter),
             HashMap::from([(now1s.to_rfc3339().into(), one.clone().into())]),
-        )])).await;
+        )]))
+        .await;
 
         // Finish setup
         let bed = bed.part2(filter, now, Some(db)).await;
@@ -503,7 +507,8 @@ async fn one_outdated_db_match() {
         let db = TempDatabase::from_loaded_db(HashMap::from([(
             filter_ordered_times_db_name(filter),
             HashMap::from([(now1s.to_rfc3339().into(), one.clone().into())]),
-        )])).await;
+        )]))
+        .await;
 
         // Finish setup
         let bed = bed.part2(filter, now, Some(db)).await;
@@ -633,7 +638,8 @@ async fn trigger_matched_pattern() {
         let db = TempDatabase::from_loaded_db(HashMap::from([(
             filter_ordered_times_db_name(filter),
             HashMap::from([(now1s.to_rfc3339().into(), one.clone().into())]),
-        )])).await;
+        )]))
+        .await;
         let bed = bed.part2(filter, now, Some(db)).await;
 
         bed.manager
@@ -720,7 +726,8 @@ async fn trigger_deduplication_on_start() {
                     now2s.to_rfc3339(): 1,
                 }),
             )]),
-        )])).await;
+        )]))
+        .await;
         let bed = bed.part2(filter, now, Some(db)).await;
 
         // the action executes