deblan-mirror/reaction
1
0
Fork 0
mirror of https://framagit.org/ppom/reaction synced 2026-03-14 20:55:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix tests

Browse source
This commit is contained in:
ppom 2025-10-05 12:00:00 +02:00
commit b02b5f4b14
No known key found for this signature in database
3 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/concepts/action.rs
View file

@ -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,
}

4
src/concepts/stream.rs
View file

@ -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,
}

21
src/daemon/filter/tests.rs
View file

@ -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