Skip to content

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

test(storage): assert tenant router caching instead of scope strings

Steven Enamakel5134918f279e
diff --git a/crates/openhuman-core/src/profiles/recovery_tests.rs b/crates/openhuman-core/src/profiles/recovery_tests.rs
index 4a2b40f9ef..d6701ae3fc 100644
--- a/crates/openhuman-core/src/profiles/recovery_tests.rs
+++ b/crates/openhuman-core/src/profiles/recovery_tests.rs
@@ -14,9 +14,7 @@ fn profile() -> ProfileId {
fn context_with_store() -> (Arc<CoreContext>, Arc<dyn SessionStoreProvider>) {
let backend = memory_backend();
let provider: Arc<dyn SessionStoreProvider> = Arc::new(
- tinyagents_session::DriverSessionStores::new(backend, crate::storage::Scope::local())
- .unwrap()
- .recover_on_open(false),
+ crate::storage::sessions::TenantSessionStores::new(backend, false).unwrap(),
);
let mut overrides = crate::agent::host_overrides::HostOverrides::default();
overrides.session_store = Some(Arc::clone(&provider));
diff --git a/crates/openhuman-core/src/profiles/storage_schema_tests.rs b/crates/openhuman-core/src/profiles/storage_schema_tests.rs
index 7ac9049db5..49e55225ca 100644
--- a/crates/openhuman-core/src/profiles/storage_schema_tests.rs
+++ b/crates/openhuman-core/src/profiles/storage_schema_tests.rs
@@ -2,7 +2,8 @@ use super::*;
use crate::storage::test_support::sqlite_backend;
use serde_json::json;
use std::sync::Arc;
-use tinystoragedrivers::{Meta, Precondition, Scope};
+use crate::storage::Scope;
+use tinystoragedrivers::{Meta, Precondition};
#[test]
fn a_registry_row_loses_its_seconds_field_and_keeps_its_creation_time() {
diff --git a/crates/openhuman-core/src/storage/sessions/rebound_tests.rs b/crates/openhuman-core/src/storage/sessions/rebound_tests.rs
index 9bb12faed6..985f2aacc8 100644
--- a/crates/openhuman-core/src/storage/sessions/rebound_tests.rs
+++ b/crates/openhuman-core/src/storage/sessions/rebound_tests.rs
@@ -1,6 +1,6 @@
use super::*;
use crate::storage::test_support::memory_backend;
-use tinystoragedrivers::Scope;
+use crate::storage::Scope;
fn put_marker(stores: &ReboundSessionStores, backend: &Arc<dyn StorageBackend>) {
// Opening an agent's stores declares its collections in the backend.
diff --git a/crates/openhuman-core/src/storage/sessions/tenant_router_tests.rs b/crates/openhuman-core/src/storage/sessions/tenant_router_tests.rs
index ba683139ab..1679e73f0d 100644
--- a/crates/openhuman-core/src/storage/sessions/tenant_router_tests.rs
+++ b/crates/openhuman-core/src/storage/sessions/tenant_router_tests.rs
@@ -9,12 +9,12 @@ fn stores() -> TenantSessionStores {
fn an_unprofiled_key_routes_to_the_local_tenant() {
let router = stores();
let (provider, agent) = router.route("asha");
- assert_eq!(provider.tenant(), &Scope::local());
assert_eq!(agent, "asha");
- assert_eq!(
- provider.scope_for(&agent).unwrap().as_str(),
- "local/agent:asha"
- );
+ let (same_provider, same_agent) = router.route("asha");
+ assert!(Arc::ptr_eq(&provider, &same_provider));
+ assert_eq!(same_agent, "asha");
+ let (profile_provider, _) = router.route("u~asha");
+ assert!(!Arc::ptr_eq(&provider, &profile_provider));
}
#[test]
@@ -25,11 +25,10 @@ fn a_profile_key_routes_to_the_profile_tenant() {
agent: Some("asha".into()),
});
let (provider, agent) = router.route(&key);
- assert_eq!(provider.tenant().as_str(), "u:alice");
- assert_eq!(
- provider.scope_for(&agent).unwrap().as_str(),
- "u:alice/agent:asha"
- );
+ assert_eq!(agent, "asha");
+ let (same_provider, same_agent) = router.route(&key);
+ assert!(Arc::ptr_eq(&provider, &same_provider));
+ assert_eq!(same_agent, "asha");
}
#[test]
@@ -40,11 +39,9 @@ fn escaped_keys_round_trip_to_the_same_tenant_and_agent() {
agent: None,
});
let (provider, agent) = router.route(&key);
- assert_eq!(
- provider.tenant(),
- &crate::storage::scope_for_profile("a~b%c")
- );
assert_eq!(agent, "default");
+ let (same_provider, _) = router.route(&key);
+ assert!(Arc::ptr_eq(&provider, &same_provider));
}
#[test]