From 37ead2f69cd6467d1b7e4d7440329b90a4c26783 Mon Sep 17 00:00:00 2001 From: houseme Date: Sun, 6 Sep 2026 23:27:01 +0800 Subject: [PATCH] test(ilm): align feature matrix lifecycle assertions (#7311) Co-authored-by: zhi22915 --- rustfs/src/admin/handlers/ilm_transition.rs | 4 ++-- rustfs/src/app/bucket_usecase.rs | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rustfs/src/admin/handlers/ilm_transition.rs b/rustfs/src/admin/handlers/ilm_transition.rs index da87b40d3..a478a5778 100644 --- a/rustfs/src/admin/handlers/ilm_transition.rs +++ b/rustfs/src/admin/handlers/ilm_transition.rs @@ -2153,7 +2153,7 @@ mod tests { let inspect = src .split("impl Operation for TransitionReconcileInspectHandler") .nth(1) - .and_then(|block| block.split("impl Operation for TransitionReconcileApplyHandler").next()) + .and_then(|block| block.split("pub struct IlmRecoveryControlListHandler").next()) .expect("inspect handler block"); assert!(inspect.contains("AdminAction::ListTierAction")); assert!(!inspect.contains("AdminAction::SetTierAction")); @@ -2502,7 +2502,7 @@ mod tests { let wrapper = extract_block_between_markers( production, "async fn authorize_transition_admin_request", - "fn transition_transaction_id_from_params", + "async fn authorize_recovery_admin_request", ); assert_eq!( diff --git a/rustfs/src/app/bucket_usecase.rs b/rustfs/src/app/bucket_usecase.rs index 1cb5a8be9..d77531e1f 100644 --- a/rustfs/src/app/bucket_usecase.rs +++ b/rustfs/src/app/bucket_usecase.rs @@ -4070,14 +4070,13 @@ mod tests { abort_incomplete_multipart_upload: None, del_marker_expiration: None, filter: Some(s3s::dto::LifecycleRuleFilter { - prefix: Some("logs/".to_string()), - tag: Some(s3s::dto::Tag { - key: Some("env".to_string()), - value: Some("prod".to_string()), + and: Some(s3s::dto::LifecycleRuleAndOperator { + prefix: Some("logs/".to_string()), + ..Default::default() }), ..Default::default() }), - id: Some("two-predicates".to_string()), + id: Some("one-member-and".to_string()), noncurrent_version_expiration: None, noncurrent_version_transitions: None, prefix: None, @@ -4087,7 +4086,7 @@ mod tests { &ObjectLockConfiguration::default(), ) .await - .expect_err("a Filter with two predicates is a schema violation"); + .expect_err("a Filter And with one predicate is a schema violation"); assert_eq!(*lifecycle_validation_error(&malformed).code(), S3ErrorCode::MalformedXML); let invalid_value = validate_lifecycle_config(