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

Fix and enhance tests

Browse source 
The tokio task that removes the trigger after the last after-action was
not woken up & cancelled by the cancellation token, but left to die when
tokio quits.

Unfortunately this broke the tests, where tokio is kept from one
reaction launch to another. Those tasks kept a reference to the DB, then
preventing it to close, then preventing a new DB instance from being
opened.

This was difficult to debug due to the tests only checking that reaction
quits with an error, but not testing what kind of error it is.
So they now check that reaction quits with the "normal" error, which is
that all streams finished.

The tokio task is now woken up, like the other sleeping tasks, at
shutdown, and quits doing nothing.

It's not very satisfying because I assume it's a bit costly to wake up a
task, so I'm gonna see how I can improve this.

I may start a new tokio runtime for each subtest.
I may delete this task and move its instructions to the last
after-action.
I may do both.
This commit is contained in:
ppom 2025-02-16 12:00:00 +01:00
commit 82ab861132
2 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/daemon/filter.rs
View file

@ -218,15 +218,20 @@ impl FilterManager {
let triggers = self.triggers.clone();
let m = m.clone();
let t = *t;
let shutdown = self.shutdown.clone();
tokio::spawn(async move {
tokio::time::sleep(sleep_duration).await;
triggers
.fetch_and_update_ext::<Match, BTreeSet<Time>, _>(&m, |set| {
let mut set = set.unwrap_or_default();
set.remove(&t);
Some(set)
})
.unwrap();
if tokio::select! {
_ = shutdown.wait() => false,
_ = tokio::time::sleep(sleep_duration) => true
} {
triggers
.fetch_and_update_ext::<Match, BTreeSet<Time>, _>(&m, |set| {
let mut set = set.unwrap_or_default();
set.remove(&t);
Some(set)
})
.unwrap();
}
});
}
}

14
tests/simple.rs
View file

@ -148,9 +148,12 @@ async fn simple() {
file_with_contents(out_path, "");
assert!(daemon(config_path.into(), socket_path.into())
.await
.is_err());
let daemon_exit = daemon(config_path.into(), socket_path.into()).await;
assert!(daemon_exit.is_err());
assert_eq!(
daemon_exit.unwrap_err().to_string(),
"quitting because all streams finished"
);
// 36 from DB
// 12 from DB
@ -183,8 +186,11 @@ async fn simple() {
file_with_contents(out_path, "");
let daemon_exit = daemon(config_path.into(), socket_path.into()).await;
eprintln!("daemon exit with {:?}", daemon_exit);
assert!(daemon_exit.is_err());
assert_eq!(
daemon_exit.unwrap_err().to_string(),
"quitting because all streams finished"
);
// make sure all numbers appear in the output
assert_eq!(