Skip to content

test(persistence): make CAS conflict test deterministic #1464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pimlock merged 2 commits into from
May 19, 2026
+7 −15
Merged

test(persistence): make CAS conflict test deterministic #1464

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fd0485
test(persistence): make CAS conflict test deterministic
pimlock May 19, 2026
14bcdbc
test(persistence): simplify CAS conflict assertion
pimlock May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions crates/openshell-server/src/persistence/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1341,7 +1341,6 @@ async fn cas_update_message_cas_succeeds() {
async fn cas_update_message_cas_conflicts_on_concurrent_updates() {
use openshell_core::proto::Sandbox;
use std::sync::Arc;
use std::sync::atomic::{AtomicU32, Ordering};

let store = Arc::new(
Store::connect("sqlite::memory:?cache=shared")
Expand All @@ -1366,24 +1365,18 @@ async fn cas_update_message_cas_conflicts_on_concurrent_updates() {

store.put_message(&sandbox).await.unwrap();

// Track how many updates succeed
let success_count = Arc::new(AtomicU32::new(0));

// Spawn 5 concurrent CAS updates (using expected_version = 0 to use current)
// Spawn 5 concurrent CAS updates using the same observed version. Passing an
// explicit version makes this deterministic: later tasks cannot re-read the
// latest committed version and legitimately succeed.
let mut handles = vec![];
for i in 0..5 {
let store = Arc::clone(&store);
let success_count = Arc::clone(&success_count);
let handle = tokio::spawn(async move {
let result = store
.update_message_cas::<Sandbox, _>("test-id", 0, |s| {
store
.update_message_cas::<Sandbox, _>("test-id", 1, |s| {
s.current_policy_version = i;
})
.await;
if result.is_ok() {
success_count.fetch_add(1, Ordering::SeqCst);
}
result
.await
});
handles.push(handle);
}
Expand All @@ -1394,15 +1387,14 @@ async fn cas_update_message_cas_conflicts_on_concurrent_updates() {
.map(|r| r.unwrap())
.collect();

// Only one should succeed; others fail with Conflict due to single-attempt CAS
// Only one should succeed; others fail with Conflict due to single-attempt CAS.
let successes = results.iter().filter(|r| r.is_ok()).count();
let conflicts = results
.iter()
.filter(|r| matches!(r, Err(PersistenceError::Conflict { .. })))
.count();
assert_eq!(successes, 1, "exactly one concurrent update should succeed");
assert_eq!(conflicts, 4, "four updates should fail with Conflict");
assert_eq!(success_count.load(Ordering::SeqCst), 1);

// Final version should be 2 (initial 1 + 1 successful update)
let final_sandbox = store
Expand Down
Loading