diff --git a/.config/e2e-full-selection.txt b/.config/e2e-full-selection.txt index dfad0f0bd..59a5d8ab9 100644 --- a/.config/e2e-full-selection.txt +++ b/.config/e2e-full-selection.txt @@ -1,2 +1,2 @@ -sha256-darwin=9f767b37ed8b1c82da62ea441462d75487785c8086e56f08fb6f6cd89c6e2e52 -sha256-linux=fbdaf42b220958d4b1e8880e0f8b5a7992d38e21051bb60596dd4538424757d6 +sha256-darwin=f832043fcca8c0b616c5d820a3a652da7544298ef5812a8668a3a9a3e4607b8b +sha256-linux=93b94adb110b86a41d0b7313909e0bf53cb1515e2d08e8f105652b29b249990f diff --git a/crates/e2e_test/src/group_delete_test.rs b/crates/e2e_test/src/group_delete_test.rs index 38d053f99..d6aaec32f 100644 --- a/crates/e2e_test/src/group_delete_test.rs +++ b/crates/e2e_test/src/group_delete_test.rs @@ -14,7 +14,7 @@ //! E2E tests for group management (fixes #2028). -use crate::common::{RustFSTestEnvironment, admin_request, awscurl_delete, awscurl_get, awscurl_put, init_logging}; +use crate::common::{RustFSTestEnvironment, admin_ok, admin_request, init_logging}; use aws_sdk_s3::config::{Credentials, Region}; use aws_sdk_s3::{Client, Config}; use tracing::info; @@ -83,7 +83,6 @@ async fn update_group_members_rejects_invalid_new_group_names() -> Result<(), Bo /// Test that deleting a group with members fails, and deleting an empty group succeeds. #[tokio::test(flavor = "multi_thread")] -#[ignore = "requires awscurl and spawns a real RustFS server"] async fn test_delete_group_requires_empty_membership() -> Result<(), Box> { init_logging(); @@ -91,29 +90,58 @@ async fn test_delete_group_requires_empty_membership() -> Result<(), BoxInvalidRequest"), + "deleting a non-empty group must return InvalidRequest, body: {delete_body}" + ); + assert!( + delete_body.contains("group is not empty"), + "deleting a non-empty group returned an unexpected message: {delete_body}" + ); info!("Delete of non-empty group correctly rejected"); // 4. Remove the member from the group @@ -123,17 +151,42 @@ async fn test_delete_group_requires_empty_membership() -> Result<(), BoxNoSuchResource"), + "a deleted group must return NoSuchResource, body: {get_body}" + ); + assert!( + get_body.contains("group 'testgroup' does not exist"), + "a deleted group returned an unexpected message: {get_body}" + ); info!("Confirmed testgroup no longer exists"); Ok(()) @@ -142,7 +195,6 @@ async fn test_delete_group_requires_empty_membership() -> Result<(), Box Result<(), Box> { init_logging(); @@ -160,39 +212,56 @@ async fn test_user_with_only_group_gets_group_policies() -> Result<(), Box Result<(), Box Result<(), Box> { init_logging(); @@ -221,33 +289,47 @@ async fn test_delete_group_after_deleting_user() -> Result<(), Box