gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-29 08:27:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ci): release Connect test locks before await (#6620)

Browse Source
This commit is contained in:
Zhengchao An
2026-08-26 11:37:07 +08:00
committed by GitHub
parent c0c208d89a
commit 4bc9dc482a
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/tests/connect_registration.rs
+19 -17
View File
@@ -961,17 +961,18 @@ async fn heartbeat_runtime_skips_only_valid_pending_reenrollment() {
assert_eq!(fs::read(&pending_path).expect("preserved pending reenrollment"), pending); assert_eq!(fs::read(&pending_path).expect("preserved pending reenrollment"), pending);
assert_eq!(fs::read(&next_path).expect("preserved pending reenrollment key"), next); assert_eq!(fs::read(&next_path).expect("preserved pending reenrollment key"), next);
assert_eq!(fs::read(&credential_path).expect("preserved current credential"), credential); assert_eq!(fs::read(&credential_path).expect("preserved current credential"), credential);
let paths = server.paths.lock().expect("paths lock"); {
assert_eq!( let paths = server.paths.lock().expect("paths lock");
paths assert_eq!(
.iter() paths
.filter(|path| path.ends_with("registrationTokens:exchange")) .iter()
.count(), .filter(|path| path.ends_with("registrationTokens:exchange"))
4 .count(),
); 4
assert_eq!(paths.iter().filter(|path| path.ends_with(":rotateCredential")).count(), 0); );
assert_eq!(paths.iter().filter(|path| path.ends_with("/heartbeats")).count(), 1); assert_eq!(paths.iter().filter(|path| path.ends_with(":rotateCredential")).count(), 0);
drop(paths); assert_eq!(paths.iter().filter(|path| path.ends_with("/heartbeats")).count(), 1);
}
for (field, value) in [ for (field, value) in [
("requestId", "not-a-request-id"), ("requestId", "not-a-request-id"),
@@ -1377,13 +1378,14 @@ async fn rotation_commit_recovers_after_each_durable_step() {
.await, .await,
Err(ClientError::Unavailable { .. }) Err(ClientError::Unavailable { .. })
)); ));
let failed_seen = failed.seen.lock().expect("seen lock"); {
assert_eq!(failed_seen.len(), 3, "public rotation keeps its bounded retry contract"); let failed_seen = failed.seen.lock().expect("seen lock");
for request in &failed_seen[1..] { assert_eq!(failed_seen.len(), 3, "public rotation keeps its bounded retry contract");
assert_eq!(request["requestId"], failed_seen[0]["requestId"]); for request in &failed_seen[1..] {
assert_eq!(request["certificateRequest"], failed_seen[0]["certificateRequest"]); assert_eq!(request["requestId"], failed_seen[0]["requestId"]);
assert_eq!(request["certificateRequest"], failed_seen[0]["certificateRequest"]);
}
} }
drop(failed_seen);
let pending_path = temp.path().join("credential/rotation.pending.json"); let pending_path = temp.path().join("credential/rotation.pending.json");
let pending = fs::read(&pending_path).expect("read pending state"); let pending = fs::read(&pending_path).expect("read pending state");