From c1b64e83a9fdd65ae62f3576ed716535ea36cede Mon Sep 17 00:00:00 2001 From: Andrey Berezin Date: Mon, 15 May 2023 20:20:27 +0300 Subject: [PATCH] Fix tests Signed-off-by: Andrey Berezin --- pytest_tests/testsuites/object/test_object_api_bearer.py | 6 +++--- pytest_tests/testsuites/services/s3_gate/test_s3_object.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pytest_tests/testsuites/object/test_object_api_bearer.py b/pytest_tests/testsuites/object/test_object_api_bearer.py index 6ed75d55..992b137f 100644 --- a/pytest_tests/testsuites/object/test_object_api_bearer.py +++ b/pytest_tests/testsuites/object/test_object_api_bearer.py @@ -51,7 +51,7 @@ def user_container( endpoint=cluster.default_rpc_endpoint, ) # Deliberately using s3gate wallet here to test bearer token - s3gate = cluster.s3gates[0] + s3gate = cluster.s3_gates[0] return StorageContainer( StorageContainerInfo(container_id, WalletInfo.from_node(s3gate)), client_shell, @@ -106,7 +106,7 @@ class TestObjectApiWithBearerToken(ClusterTestBase): f"Object can be deleted from any node using s3gate wallet with bearer token for {request.node.callspec.id}" ) - s3_gate_wallet = self.cluster.s3gates[0] + s3_gate_wallet = self.cluster.s3_gates[0] with allure.step("Try to delete each object from first storage node"): for storage_object in storage_objects: with expect_not_raises(): @@ -142,7 +142,7 @@ class TestObjectApiWithBearerToken(ClusterTestBase): f"Object can be fetched from any node using s3gate wallet with bearer token for {request.node.callspec.id}" ) - s3_gate_wallet = self.cluster.s3gates[0] + s3_gate_wallet = self.cluster.s3_gates[0] with allure.step("Put one object to container"): epoch = self.get_epoch() storage_object = user_container.generate_object( diff --git a/pytest_tests/testsuites/services/s3_gate/test_s3_object.py b/pytest_tests/testsuites/services/s3_gate/test_s3_object.py index 9f174daf..65e24c69 100644 --- a/pytest_tests/testsuites/services/s3_gate/test_s3_object.py +++ b/pytest_tests/testsuites/services/s3_gate/test_s3_object.py @@ -925,7 +925,7 @@ class TestS3GateObject: obj_head.get("Metadata") == object_metadata ), f"Metadata of object is {object_metadata}" # Uncomment after https://github.com/nspcc-dev/neofs-s3-gw/issues/685 is solved - # obj_acl = s3_client.get_object_acl(self.s3_client, bucket, obj_key) + # obj_acl = s3_client.get_object_acl(bucket, obj_key) # s3_helper.assert_s3_acl(acl_grants = obj_acl, permitted_users = "AllUsers") @allure.title("Test S3 Put 10 nested level object") @@ -976,8 +976,8 @@ class TestS3GateObject: s3_client.put_object(bucket, file_path) with allure.step("Delete the object from the bucket"): - delete_object = s3_client.delete_object(s3_client, bucket, file_name) - versions = s3_client.list_objects_versions(s3_client, bucket) + delete_object = s3_client.delete_object(bucket, file_name) + versions = s3_client.list_objects_versions(bucket) obj_versions = { version.get("VersionId") for version in versions if version.get("Key") == file_name