Tests: Refactor Bucket tests to use fixtures

Author: ByteOtter

tests/s3/test_bucket.py

@@ -8,49 +8,41 @@
 
 import io
 import pytest
-import boto3
-from moto import mock_aws
 from pathlib import Path
 
 from gardenlinux.s3.bucket import Bucket
 
 
-BUCKET_NAME = "test-bucket"
 REGION = "us-east-1"
 
 
-@mock_aws
-def test_objects_empty():
+def test_objects_empty(s3_setup):
     """
     List objects from empty bucket.
     """
     # Arrange
-    s3 = boto3.resource("s3", region_name=REGION)
-    s3.create_bucket(Bucket=BUCKET_NAME)
+    s3, bucket_name, _ = s3_setup
 
     # Act
-    bucket = Bucket(bucket_name=BUCKET_NAME, s3_resource_config={"region_name": REGION})
-    objects = list(bucket.objects)
+    bucket = Bucket(bucket_name, s3_resource_config={"region_name": REGION})
 
     # Assert
-    assert objects == []
+    assert list(bucket.objects) == []
 
 
-@mock_aws
-def test_upload_file_and_list(tmp_path):
+def test_upload_file_and_list(s3_setup):
     """
     Create a fake file in a temporary directory, upload and try
     to list it
     """
     # Arrange
-    s3 = boto3.resource("s3", region_name=REGION)
-    s3.create_bucket(Bucket=BUCKET_NAME)
+    s3, bucket_name, tmp_path = s3_setup
 
     test_file = tmp_path / "example.txt"
     test_file.write_text("hello moto")
 
     # Act
-    bucket = Bucket(bucket_name=BUCKET_NAME, s3_resource_config={"region_name": REGION})
+    bucket = Bucket(bucket_name, s3_resource_config={"region_name": REGION})
     bucket.upload_file(str(test_file), "example.txt")
 
     all_keys = [obj.key for obj in bucket.objects]
@@ -59,87 +51,76 @@ def test_upload_file_and_list(tmp_path):
     assert "example.txt" in all_keys
 
 
-@mock_aws
-def test_download_file(tmp_path):
+def test_download_file(s3_setup):
     """
     Try to download a file pre-existing in the bucket
     """
     # Arrange
-    s3 = boto3.resource("s3", region_name=REGION)
-    s3.create_bucket(Bucket=BUCKET_NAME)
-    s3.Object(BUCKET_NAME, "file.txt").put(Body=b"some data")
+    s3, bucket_name, tmp_path = s3_setup
+    s3.Object(bucket_name, "file.txt").put(Body=b"some data")
 
     # Act
-    bucket = Bucket(bucket_name=BUCKET_NAME, s3_resource_config={"region_name": REGION})
-
+    bucket = Bucket(bucket_name, s3_resource_config={"region_name": REGION})
     target_path = tmp_path / "downloaded.txt"
     bucket.download_file("file.txt", str(target_path))
 
     # Assert
     assert target_path.read_text() == "some data"
 
 
-@mock_aws
-def test_upload_fileobj():
+def test_upload_fileobj(s3_setup):
     """
     Upload a file-like in-memory object to the bucket
     """
     # Arrange
-    s3 = boto3.resource("s3", region_name=REGION)
-    s3.create_bucket(Bucket=BUCKET_NAME)
+    s3, bucket_name, _ = s3_setup
 
     # Act
     # Create in-memory binary stream (file content)
     data = io.BytesIO(b"Test Data")
-    bucket = Bucket(bucket_name=BUCKET_NAME, s3_resource_config={"region_name": REGION})
+    bucket = Bucket(bucket_name, s3_resource_config={"region_name": REGION})
     bucket.upload_fileobj(data, "binary.obj")
 
-    obj = s3.Object(BUCKET_NAME, "binary.obj").get()
+    obj = s3.Object(bucket_name, "binary.obj").get()
 
     # Assert
     assert obj["Body"].read() == b"Test Data"
 
 
-@mock_aws
-def test_download_fileobj():
+def test_download_fileobj(s3_setup):
     """
     Download data into a in-memory object
     """
     # Arange
-    s3 = boto3.resource("s3", region_name=REGION)
-    s3.create_bucket(Bucket=BUCKET_NAME)
+    s3, bucket_name, _ = s3_setup
     # Put some object in the bucket
-    s3.Object(BUCKET_NAME, "somekey").put(Body=b"123abc")
+    s3.Object(bucket_name, "somekey").put(Body=b"123abc")
 
     # Act
-    bucket = Bucket(bucket_name=BUCKET_NAME, s3_resource_config={"region_name": REGION})
-
+    bucket = Bucket(bucket_name, s3_resource_config={"region_name": REGION})
     # Create empty in-memory bytestream to act as a writable file
     output = io.BytesIO()
     bucket.download_fileobj("somekey", output)
-
     # Reset binary cursor to prepare for read
     output.seek(0)
 
     # Assert
     assert output.read() == b"123abc"
 
 
-@mock_aws
-def test_getattr_delegates():
+def test_getattr_delegates(s3_setup):
     """
     Verify that attribute access is delegated to the underlying boto3 Bucket.
 
     This checks that accessing e.g. `.name` on our custom Bucket works by forwarding
     the call to the real boto3 bucket.
     """
     # Arrange
-    s3 = boto3.resource("s3", region_name=REGION)
-    s3.create_bucket(Bucket=BUCKET_NAME)
+    _, bucket_name, _ = s3_setup
 
     # Act
-    bucket = Bucket(bucket_name=BUCKET_NAME, s3_resource_config={"region_name": REGION})
+    bucket = Bucket(bucket_name, s3_resource_config={"region_name": REGION})
 
     # Assert
     # __getattr__ should delegate this to the underlying boto3 Bucket object
-    assert bucket.name == BUCKET_NAME
+    assert bucket.name == bucket_name