Skip to content

The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.

test(runtime): update delivery import tests to use rig structure

Steven Enamakel4863cd6636be
diff --git a/crates/openhuman-core/src/channels/runtime/startup/delivery_import_tests.rs b/crates/openhuman-core/src/channels/runtime/startup/delivery_import_tests.rs
index 388f7c74de..ad8439eb49 100644
--- a/crates/openhuman-core/src/channels/runtime/startup/delivery_import_tests.rs
+++ b/crates/openhuman-core/src/channels/runtime/startup/delivery_import_tests.rs
@@ -1,6 +1,7 @@
use super::*;
use tinychannels_bus::{ChannelOutboundIntent, DeliveryDurability, OutboundPayload};
-use tinystoragedrivers::{MemoryStorage, Scope, StorageBackend};
+use std::sync::Arc;
+use tinystoragedrivers::{Scope, StorageBackend};
fn entry(id: &str, at: u64) -> DeliveryQueueEntry {
DeliveryQueueEntry::new(
@@ -20,11 +21,31 @@ fn entry(id: &str, at: u64) -> DeliveryQueueEntry {
)
}
-fn scoped() -> tinystoragedrivers::ScopedStorage {
- let backend = MemoryStorage::new();
- backend
- .for_scope(&Scope::new("module:tinychannels@test").unwrap())
- .unwrap()
+struct Rig {
+ _dir: tempfile::TempDir,
+ backend: Arc<dyn StorageBackend>,
+ scope: Scope,
+}
+
+impl Rig {
+ fn scoped(&self) -> tinystoragedrivers::ScopedStorage {
+ self.backend.for_scope(&self.scope).unwrap()
+ }
+}
+
+fn rig() -> Rig {
+ let dir = tempfile::tempdir().unwrap();
+ let url = format!("sqlite:{}", dir.path().join("storage.sqlite").display());
+ let backend = crate::storage::block_on(crate::storage::open(&url)).unwrap();
+ Rig {
+ _dir: dir,
+ backend,
+ scope: Scope::new("module:tinychannels@test").unwrap(),
+ }
+}
+
+async fn import(rig: &Rig, workspace: &Path) -> anyhow::Result<Outcome> {
+ import_into(&rig.backend, &rig.scope, workspace).await
}
fn write_legacy(workspace: &Path, body: &Value) {
@@ -56,10 +77,11 @@ async fn legacy_queue_lands_in_the_module_collections_and_the_file_is_untouched(
let dir = tempfile::tempdir().unwrap();
write_legacy(dir.path(), &legacy_state());
let before = std::fs::read(dir.path().join(LEGACY_FILE)).unwrap();
- let scoped = scoped();
+ let rig = rig();
+ let scoped = rig.scoped();
let docs = std::sync::Arc::clone(scoped.documents());
- let outcome = import_into(&scoped, dir.path()).await.unwrap();
+ let outcome = import(&rig, dir.path()).await.unwrap();
// Expired results are not carried over.
assert_eq!(
@@ -83,15 +105,16 @@ async fn legacy_queue_lands_in_the_module_collections_and_the_file_is_untouched(
async fn the_import_runs_once_so_a_finished_delivery_is_not_resurrected() {
let dir = tempfile::tempdir().unwrap();
write_legacy(dir.path(), &legacy_state());
- let scoped = scoped();
+ let rig = rig();
+ let scoped = rig.scoped();
let docs = std::sync::Arc::clone(scoped.documents());
- import_into(&scoped, dir.path()).await.unwrap();
+ import(&rig, dir.path()).await.unwrap();
docs.delete(PENDING, "p1", Precondition::None)
.await
.unwrap();
assert_eq!(
- import_into(&scoped, dir.path()).await.unwrap(),
+ import(&rig, dir.path()).await.unwrap(),
Outcome::AlreadyDone
);
assert!(docs.get(PENDING, "p1").await.unwrap().is_none());
@@ -101,14 +124,15 @@ async fn the_import_runs_once_so_a_finished_delivery_is_not_resurrected() {
async fn an_existing_module_record_is_never_overwritten() {
let dir = tempfile::tempdir().unwrap();
write_legacy(dir.path(), &legacy_state());
- let scoped = scoped();
+ let rig = rig();
+ let scoped = rig.scoped();
let docs = std::sync::Arc::clone(scoped.documents());
let newer = serde_json::to_value(entry("p1", 99)).unwrap();
docs.put(PENDING, "p1", newer.clone(), Precondition::Absent)
.await
.unwrap();
- let outcome = import_into(&scoped, dir.path()).await.unwrap();
+ let outcome = import(&rig, dir.path()).await.unwrap();
assert_eq!(
outcome,
@@ -123,14 +147,14 @@ async fn an_existing_module_record_is_never_overwritten() {
#[tokio::test]
async fn a_missing_file_imports_nothing_and_writes_no_marker() {
let dir = tempfile::tempdir().unwrap();
- let scoped = scoped();
+ let rig = rig();
assert_eq!(
- import_into(&scoped, dir.path()).await.unwrap(),
+ import(&rig, dir.path()).await.unwrap(),
Outcome::NoSource
);
write_legacy(dir.path(), &legacy_state());
assert!(matches!(
- import_into(&scoped, dir.path()).await.unwrap(),
+ import(&rig, dir.path()).await.unwrap(),
Outcome::Imported { .. }
));
}
@@ -141,12 +165,12 @@ async fn a_corrupt_file_fails_without_a_marker_and_is_retried_once_repaired() {
let path = dir.path().join(LEGACY_FILE);
std::fs::create_dir_all(path.parent().unwrap()).unwrap();
std::fs::write(&path, b"{ not json").unwrap();
- let scoped = scoped();
- assert!(import_into(&scoped, dir.path()).await.is_err());
+ let rig = rig();
+ assert!(import(&rig, dir.path()).await.is_err());
write_legacy(dir.path(), &legacy_state());
assert!(matches!(
- import_into(&scoped, dir.path()).await.unwrap(),
+ import(&rig, dir.path()).await.unwrap(),
Outcome::Imported { written: 4, .. }
));
}
@@ -158,9 +182,9 @@ async fn records_whose_key_does_not_match_their_id_are_skipped() {
dir.path(),
&json!({"pending": {"wrong-key": entry("p1", 1)}}),
);
- let scoped = scoped();
+ let rig = rig();
assert_eq!(
- import_into(&scoped, dir.path()).await.unwrap(),
+ import(&rig, dir.path()).await.unwrap(),
Outcome::Imported {
found: 0,
written: 0