Skip to content

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

test(profiles): align schema tests with host-declared registry

Steven Enamakel8f3b35797124
diff --git a/crates/openhuman-core/src/profiles/host_tests.rs b/crates/openhuman-core/src/profiles/host_tests.rs
index 6797db07ac..2ed4662371 100644
--- a/crates/openhuman-core/src/profiles/host_tests.rs
+++ b/crates/openhuman-core/src/profiles/host_tests.rs
@@ -36,7 +36,7 @@ fn snapshot_tree(root: &std::path::Path) -> BTreeMap<std::path::PathBuf, Vec<u8>
#[tokio::test]
#[cfg(feature = "storage-sqlite")]
-async fn inspecting_an_unprovisioned_profile_does_not_run_storage_migrations() {
+async fn inspecting_an_unprovisioned_profile_does_not_provision_or_claim_it() {
let tmp = tempfile::tempdir().unwrap();
let fixture = sqlite_backend().unwrap();
let backend = Arc::clone(&fixture.backend);
@@ -57,7 +57,9 @@ async fn inspecting_an_unprovisioned_profile_does_not_run_storage_migrations() {
let layout = host.layout_of(&id);
let default_context = CoreContext::default_context();
- assert!(docs.validate_collection_spec(&registry_spec).await.is_err());
+ // The host declares its registry during construction. Inspection must
+ // still leave the profile absent and must not claim its lease.
+ assert!(docs.validate_collection_spec(&registry_spec).await.is_ok());
assert!(docs.validate_collection_spec(&lease_spec).await.is_err());
assert_eq!(
host.inspect_for_doctor(&id).await,
@@ -93,12 +95,12 @@ async fn inspecting_an_unprovisioned_profile_does_not_run_storage_migrations() {
);
assert!(
- docs.validate_collection_spec(&registry_spec).await.is_err(),
- "a profile check must not create or migrate the registry schema"
+ docs.validate_collection_spec(&registry_spec).await.is_ok(),
+ "inspection leaves the host's registry schema available"
);
assert!(
docs.validate_collection_spec(&lease_spec).await.is_err(),
- "a profile check must not create or migrate the lease schema"
+ "inspection must not create or migrate the lease schema"
);
}
diff --git a/crates/openhuman-core/src/profiles/storage_schema_tests.rs b/crates/openhuman-core/src/profiles/storage_schema_tests.rs
index f17823e1fd..f6f7a9f9fb 100644
--- a/crates/openhuman-core/src/profiles/storage_schema_tests.rs
+++ b/crates/openhuman-core/src/profiles/storage_schema_tests.rs
@@ -29,7 +29,7 @@ fn a_registry_row_loses_its_seconds_field_and_keeps_its_creation_time() {
#[tokio::test]
#[cfg(feature = "storage-sqlite")]
-async fn migrate_cluster_moves_the_v1_registry_into_the_v2_collection() {
+async fn cluster_schema_declaration_leaves_legacy_registry_for_the_host_importer() {
let fixture = sqlite_backend().unwrap();
let backend = Arc::clone(&fixture.backend);
let scoped = backend.for_scope(&Scope::cluster()).unwrap();
@@ -47,16 +47,19 @@ async fn migrate_cluster_moves_the_v1_registry_into_the_v2_collection() {
.unwrap();
migrate_cluster(&scoped).await.unwrap();
migrate_cluster(&scoped).await.unwrap();
- let moved = docs
+ assert!(docs
.get(REGISTRY_COLLECTION, "alice")
.await
.unwrap()
- .unwrap();
+ .is_none());
assert_eq!(
- moved.doc,
- json!({ "profile_id": "alice", "layout_version": 2 })
+ docs.get("profiles", "alice").await.unwrap().unwrap().doc,
+ json!({ "profile_id": "alice", "created_at": 5, "layout_version": 2 })
);
- assert_eq!(moved.meta.created_ms, 5000);
+ assert!(docs
+ .validate_collection_spec(&CollectionSpec::new(REGISTRY_COLLECTION))
+ .await
+ .is_ok());
}
#[test]
@@ -69,8 +72,8 @@ fn the_schema_composes_under_its_owner() {
#[tokio::test]
#[cfg(feature = "storage-sqlite")]
-async fn migrate_cluster_moves_v1_leases_into_tsd_leases_and_keeps_their_epoch() {
- use crate::storage::lease::{DocumentLeases, LeaseStore, LEASE_OWNER};
+async fn legacy_lease_conversion_preserves_epoch_and_source_records() {
+ use crate::storage::lease::LEASE_OWNER;
let fixture = sqlite_backend().unwrap();
let backend = Arc::clone(&fixture.backend);
let scoped = backend.for_scope(&Scope::cluster()).unwrap();
@@ -96,31 +99,45 @@ async fn migrate_cluster_moves_v1_leases_into_tsd_leases_and_keeps_their_epoch()
)
.await
.unwrap();
- migrate_cluster(&scoped).await.unwrap();
- migrate_cluster(&scoped).await.unwrap();
- assert!(docs.get("leases", "alice").await.unwrap().is_none());
- assert!(docs.get("leases", "bob").await.unwrap().is_none());
- let id = crate::storage::schema_support::key_of_parts([LEASE_OWNER, "alice"]).unwrap();
- let moved = docs.get("tsd.leases", id.as_str()).await.unwrap().unwrap();
+ let converted = upgrade_lease_records(vec![
+ crate::storage::import::Record {
+ collection: "leases".into(),
+ id: "alice".into(),
+ doc: json!({ "owner": "node-a", "endpoint": "http://a", "epoch": 4,
+ "expires_at_ms": 5_000, "released": false }),
+ created_ms: None,
+ schema: None,
+ expires_ms: None,
+ updated_ms: None,
+ },
+ crate::storage::import::Record {
+ collection: "leases".into(),
+ id: "bob".into(),
+ doc: json!({ "owner": "node-a", "endpoint": null, "epoch": 2,
+ "expires_at_ms": 1_000, "released": true }),
+ created_ms: None,
+ schema: None,
+ expires_ms: None,
+ updated_ms: None,
+ },
+ ])
+ .unwrap();
+ assert_eq!(converted.len(), 2);
+ assert_eq!(converted[0].collection, "openhuman.leases");
+ assert_eq!(
+ converted[0].id,
+ crate::storage::schema_support::key_of_parts([LEASE_OWNER, "alice"]).unwrap()
+ );
+ let moved = &converted[0];
assert_eq!(
moved.doc,
json!({ "holder": "node-a", "epoch": 4, "expires_ms": 5_000, "endpoint": "http://a" })
);
-
- // The host's lease store reads the moved records: alice is still held,
- // bob's released record is taken over cleanly at the next epoch.
- let b = DocumentLeases::cluster(
- backend.as_ref(),
- "node-b",
- None,
- std::time::Duration::from_secs(1),
- )
- .unwrap();
- let held = b.holder("alice").await.unwrap().unwrap();
- assert_eq!((held.owner.as_str(), held.epoch), ("node-a", 4));
- assert!(b.acquire("alice", 1_000).await.is_err());
- let taken = b.acquire("bob", 2_000).await.unwrap();
- assert_eq!((taken.epoch, taken.previous_unclean), (3, false));
- let after = b.acquire("alice", 5_000).await.unwrap();
- assert_eq!((after.epoch, after.previous_unclean), (5, true));
+ assert_eq!(converted[1].doc["released"], true);
+ assert!(docs.get("leases", "alice").await.unwrap().is_some());
+ assert!(docs
+ .get("tsd.leases", &converted[0].id)
+ .await
+ .unwrap()
+ .is_none());
}