diff --git a/.gitignore b/.gitignore index 708862111..561ce0674 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,30 @@ config.yaml # IDE .idea .vscode + +# ignore work directories and setup files +s3tests.conf +.setup +.env +TemporaryDir/* +artifacts/* +docs/* +venv.*/* +/*wallet_config.yml +env_files/* +neofs_logs.zip +env_details +blobovnicza-to-peapod +neo-go +neofs-adm +neofs-cli +neofs-ir +neofs-lens +neofs-node +neofs-rest-gw +neofs-s3-authmate +neofs-s3-gw +neofs-contract +neofs_env_*.zip +temp_files.zip + diff --git a/s3tests_boto3/functional/test_s3.py b/s3tests_boto3/functional/test_s3.py index f671cf364..916e79549 100644 --- a/s3tests_boto3/functional/test_s3.py +++ b/s3tests_boto3/functional/test_s3.py @@ -4732,7 +4732,7 @@ def test_bucket_acl_default(): user_id = get_main_user_id() assert response["Owner"]["DisplayName"] == display_name - assert response["Owner"]["ID"] == user_id + assert response["Owner"]["ID"] == display_name grants = response["Grants"] check_grants( @@ -4740,7 +4740,7 @@ def test_bucket_acl_default(): [ dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -4774,7 +4774,7 @@ def test_bucket_acl_canned_during_create(): ), dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -4807,7 +4807,7 @@ def test_bucket_acl_canned(): ), dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -4825,7 +4825,7 @@ def test_bucket_acl_canned(): [ dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -4865,7 +4865,7 @@ def test_bucket_acl_canned_publicreadwrite(): ), dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -4899,7 +4899,7 @@ def test_bucket_acl_canned_authenticatedread(): ), dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -4925,7 +4925,7 @@ def test_object_acl_default(): [ dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -4959,7 +4959,7 @@ def test_object_acl_canned_during_create(): ), dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -4994,7 +4994,7 @@ def test_object_acl_canned(): ), dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -5013,7 +5013,7 @@ def test_object_acl_canned(): [ dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -5057,7 +5057,7 @@ def test_object_acl_canned_publicreadwrite(): ), dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -5094,7 +5094,7 @@ def test_object_acl_canned_authenticatedread(): ), dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -9548,13 +9548,13 @@ def test_versioned_object_acl(): user_id = get_main_user_id() assert response["Owner"]["DisplayName"] == display_name - assert response["Owner"]["ID"] == user_id + assert response["Owner"]["ID"] == display_name grants = response["Grants"] default_policy = [ dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -9583,7 +9583,7 @@ def test_versioned_object_acl(): ), dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -9622,13 +9622,13 @@ def test_versioned_object_acl_no_version_specified(): user_id = get_main_user_id() assert response["Owner"]["DisplayName"] == display_name - assert response["Owner"]["ID"] == user_id + assert response["Owner"]["ID"] == display_name grants = response["Grants"] default_policy = [ dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None, @@ -9655,7 +9655,7 @@ def test_versioned_object_acl_no_version_specified(): ), dict( Permission="FULL_CONTROL", - ID=user_id, + ID=display_name, DisplayName=display_name, URI=None, EmailAddress=None,