Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
084a13426a | ||
|
|
499996329f |
@@ -1,5 +1,6 @@
|
||||
"""Integration tests related to base CRUD functions."""
|
||||
|
||||
import logging
|
||||
from io import BytesIO
|
||||
|
||||
import pytest
|
||||
@@ -7,71 +8,99 @@ import pytest
|
||||
from shared.datastore import connect_minio, delete, get, put
|
||||
|
||||
|
||||
def test_should_get_data(
|
||||
data_in_minio,
|
||||
):
|
||||
data, bucket_name, object_name = data_in_minio
|
||||
client = connect_minio()
|
||||
received_data = get(
|
||||
client=client,
|
||||
bucket_name=bucket_name,
|
||||
object_name=object_name,
|
||||
)
|
||||
assert isinstance(data, BytesIO)
|
||||
assert received_data == data
|
||||
def same_data(
|
||||
data_a: BytesIO,
|
||||
data_b: BytesIO,
|
||||
) -> bool:
|
||||
"""Check if two BytesIO-objects contain the same data."""
|
||||
assert isinstance(data_a, BytesIO)
|
||||
assert isinstance(data_b, BytesIO)
|
||||
# prepare for being read
|
||||
data_a.seek(0)
|
||||
data_b.seek(0)
|
||||
# convert to bytes
|
||||
data_a_bytes = data_a.read()
|
||||
data_b_bytes = data_b.read()
|
||||
# compare size
|
||||
logging.error(len(data_a_bytes))
|
||||
logging.error(len(data_b_bytes))
|
||||
if len(data_a_bytes) != len(data_b_bytes):
|
||||
return False
|
||||
# compare content
|
||||
if data_a_bytes != data_b_bytes:
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
def test_should_delete_data(
|
||||
data_in_minio,
|
||||
):
|
||||
_, bucket_name, object_name = data_in_minio
|
||||
client = connect_minio()
|
||||
delete(
|
||||
client=client,
|
||||
bucket_name=bucket_name,
|
||||
object_name=object_name,
|
||||
)
|
||||
with pytest.raises(ValueError):
|
||||
_ = get(
|
||||
client=client,
|
||||
bucket_name=bucket_name,
|
||||
object_name=object_name,
|
||||
)
|
||||
# def test_should_get_data(
|
||||
# minio_client,
|
||||
# data_in_minio,
|
||||
# ):
|
||||
# data, bucket_name, object_name = data_in_minio
|
||||
# received_data = get(
|
||||
# client=minio_client,
|
||||
# bucket_name=bucket_name,
|
||||
# object_name=object_name,
|
||||
# )
|
||||
|
||||
# assert isinstance(data, BytesIO)
|
||||
# assert same_data(data, received_data)
|
||||
|
||||
|
||||
def test_should_put_data(
|
||||
data,
|
||||
):
|
||||
buffer, bucket_name, object_name = data
|
||||
client = connect_minio()
|
||||
put(
|
||||
client=client,
|
||||
buffer=buffer,
|
||||
bucket_name=bucket_name,
|
||||
object_name=object_name,
|
||||
)
|
||||
received_data = get(
|
||||
client=client,
|
||||
bucket_name=bucket_name,
|
||||
object_name=object_name,
|
||||
)
|
||||
assert received_data == data
|
||||
# def test_should_delete_data(
|
||||
# data_in_minio,
|
||||
# ):
|
||||
# _, bucket_name, object_name = data_in_minio
|
||||
# client = connect_minio()
|
||||
# delete(
|
||||
# client=client,
|
||||
# bucket_name=bucket_name,
|
||||
# object_name=object_name,
|
||||
# )
|
||||
# with pytest.raises(ValueError):
|
||||
# _ = get(
|
||||
# client=client,
|
||||
# bucket_name=bucket_name,
|
||||
# object_name=object_name,
|
||||
# )
|
||||
|
||||
|
||||
def test_should_update_data(
|
||||
data_in_minio,
|
||||
):
|
||||
buffer, bucket_name, object_name = data_in_minio
|
||||
client = connect_minio()
|
||||
put(
|
||||
client=client,
|
||||
buffer=buffer,
|
||||
bucket_name=bucket_name,
|
||||
object_name=object_name,
|
||||
)
|
||||
received_data = get(
|
||||
client=client,
|
||||
bucket_name=bucket_name,
|
||||
object_name=object_name,
|
||||
)
|
||||
assert received_data == buffer
|
||||
# def test_should_put_data(
|
||||
# data,
|
||||
# ):
|
||||
# buffer, bucket_name, object_name = data
|
||||
# client = connect_minio()
|
||||
# put(
|
||||
# client=client,
|
||||
# buffer=buffer,
|
||||
# bucket_name=bucket_name,
|
||||
# object_name=object_name,
|
||||
# )
|
||||
# received_data = get(
|
||||
# client=client,
|
||||
# bucket_name=bucket_name,
|
||||
# object_name=object_name,
|
||||
# )
|
||||
# assert received_data == data
|
||||
|
||||
|
||||
# def test_should_update_data(
|
||||
# data_in_minio,
|
||||
# ):
|
||||
# buffer, bucket_name, object_name = data_in_minio
|
||||
# client = connect_minio()
|
||||
# put(
|
||||
# client=client,
|
||||
# buffer=buffer,
|
||||
# bucket_name=bucket_name,
|
||||
# object_name=object_name,
|
||||
# )
|
||||
# received_data = get(
|
||||
# client=client,
|
||||
# bucket_name=bucket_name,
|
||||
# object_name=object_name,
|
||||
# )
|
||||
# assert received_data == buffer
|
||||
|
||||
if __name__ == '__main__':
|
||||
pytest.main()
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
"""Integration test configurations."""
|
||||
|
||||
import os
|
||||
import random
|
||||
from collections.abc import Iterator
|
||||
from io import BytesIO
|
||||
|
||||
import pytest
|
||||
from minio import Minio
|
||||
from PIL import Image
|
||||
from testcontainers.minio import MinioContainer
|
||||
|
||||
@@ -11,6 +15,7 @@ env_var_map = {
|
||||
'MINIO_ACCESS_KEY': 'test-access-key',
|
||||
'MINIO_SECRET_KEY': 'test-secret-key',
|
||||
'MINIO_BUCKET_NAME': 'test-bucket',
|
||||
'MINIO_OBJECT_NAME': '46KXJMFIAPVLM0TKRFZR5YPPTVJ6PJNX',
|
||||
}
|
||||
container_map = {
|
||||
'minio': MinioContainer(
|
||||
@@ -58,8 +63,70 @@ def populate_env(
|
||||
request.addfinalizer(cleanup_env)
|
||||
|
||||
|
||||
@pytest.fixture(scope='session')
|
||||
def minio_client(
|
||||
setup_infrastructure,
|
||||
populate_env,
|
||||
) -> Iterator[Minio]:
|
||||
# prepare arguments
|
||||
minio_endpoint = str(os.getenv('MINIO_ENDPOINT'))
|
||||
minio_access_key = str(os.getenv('MINIO_ACCESS_KEY'))
|
||||
minio_secret_key = str(os.getenv('MINIO_SECRET_KEY'))
|
||||
minio_bucket_name = str(os.getenv('MINIO_BUCKET_NAME'))
|
||||
# connect to minio
|
||||
client = Minio(
|
||||
endpoint=minio_endpoint,
|
||||
access_key=minio_access_key,
|
||||
secret_key=minio_secret_key,
|
||||
secure=False,
|
||||
)
|
||||
# ensure bucket exists
|
||||
if not client.bucket_exists(bucket_name=minio_bucket_name):
|
||||
client.make_bucket(bucket_name=minio_bucket_name)
|
||||
# expose client
|
||||
yield client
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def image() -> Image.Image:
|
||||
def data() -> Iterator[bytes]:
|
||||
# generate random data
|
||||
num_bytes = 2**21 # 2 MB
|
||||
data = random.randbytes(n=num_bytes)
|
||||
# expose data
|
||||
yield data
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def data_in_minio(
|
||||
minio_client,
|
||||
data,
|
||||
) -> Iterator[tuple[BytesIO, str, str]]:
|
||||
# prepare arguments
|
||||
minio_bucket_name = str(os.getenv('MINIO_BUCKET_NAME'))
|
||||
minio_object_name = str(os.getenv('MINIO_OBJECT_NAME'))
|
||||
# convert data
|
||||
buffer = BytesIO(data)
|
||||
# prepare for saving
|
||||
num_bytes = buffer.tell()
|
||||
buffer.seek(0)
|
||||
# send data to bucket
|
||||
minio_client.put_object(
|
||||
bucket_name=minio_bucket_name,
|
||||
object_name=minio_object_name,
|
||||
length=num_bytes,
|
||||
data=buffer,
|
||||
)
|
||||
# expose data
|
||||
yield buffer, minio_bucket_name, minio_object_name
|
||||
# clean up
|
||||
minio_client.remove_object(
|
||||
bucket_name=minio_bucket_name,
|
||||
object_name=minio_object_name,
|
||||
)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def image() -> Iterator[Image.Image]:
|
||||
# generate image
|
||||
image = Image.new(mode='RGB', size=(480, 480))
|
||||
# expose image
|
||||
|
||||
@@ -25,49 +25,49 @@ def same_image(
|
||||
return True
|
||||
|
||||
|
||||
def test_should_get_image(
|
||||
image_in_minio,
|
||||
):
|
||||
image, object_name = image_in_minio
|
||||
client = connect_minio()
|
||||
received_image = get_image(
|
||||
client=client,
|
||||
object_name=object_name,
|
||||
)
|
||||
assert isinstance(image, Image.Image)
|
||||
assert received_image == image
|
||||
# def test_should_get_image(
|
||||
# image_in_minio,
|
||||
# ):
|
||||
# image, object_name = image_in_minio
|
||||
# client = connect_minio()
|
||||
# received_image = get_image(
|
||||
# client=client,
|
||||
# object_name=object_name,
|
||||
# )
|
||||
# assert isinstance(image, Image.Image)
|
||||
# assert received_image == image
|
||||
|
||||
|
||||
def test_should_put_image(
|
||||
image,
|
||||
):
|
||||
client = connect_minio()
|
||||
object_name = put_image(
|
||||
client=client,
|
||||
image=image,
|
||||
)
|
||||
assert isinstance(object_name, str)
|
||||
assert len(object_name) > 0
|
||||
received_image = get_image(
|
||||
client=client,
|
||||
object_name=object_name,
|
||||
)
|
||||
assert same_image(received_image, image)
|
||||
# def test_should_put_image(
|
||||
# image,
|
||||
# ):
|
||||
# client = connect_minio()
|
||||
# object_name = put_image(
|
||||
# client=client,
|
||||
# image=image,
|
||||
# )
|
||||
# assert isinstance(object_name, str)
|
||||
# assert len(object_name) > 0
|
||||
# received_image = get_image(
|
||||
# client=client,
|
||||
# object_name=object_name,
|
||||
# )
|
||||
# assert same_image(received_image, image)
|
||||
|
||||
|
||||
def test_should_update_image(
|
||||
image_in_minio,
|
||||
):
|
||||
image, object_name = image_in_minio
|
||||
client = connect_minio()
|
||||
object_name = put_image(
|
||||
client=client,
|
||||
image=image,
|
||||
)
|
||||
assert isinstance(object_name, str)
|
||||
assert len(object_name) > 0
|
||||
received_image = get_image(
|
||||
client=client,
|
||||
object_name=object_name,
|
||||
)
|
||||
assert received_image == image
|
||||
# def test_should_update_image(
|
||||
# image_in_minio,
|
||||
# ):
|
||||
# image, object_name = image_in_minio
|
||||
# client = connect_minio()
|
||||
# object_name = put_image(
|
||||
# client=client,
|
||||
# image=image,
|
||||
# )
|
||||
# assert isinstance(object_name, str)
|
||||
# assert len(object_name) > 0
|
||||
# received_image = get_image(
|
||||
# client=client,
|
||||
# object_name=object_name,
|
||||
# )
|
||||
# assert received_image == image
|
||||
|
||||
@@ -4,50 +4,49 @@ from torch.nn import Module
|
||||
|
||||
from shared.datastore import connect_minio, get_model, put_model
|
||||
|
||||
|
||||
def test_should_get_model(
|
||||
model_in_minio,
|
||||
):
|
||||
model, object_name = model_in_minio
|
||||
client = connect_minio()
|
||||
received_model = get_model(
|
||||
client=client,
|
||||
object_name=object_name,
|
||||
)
|
||||
assert isinstance(model, Module)
|
||||
assert received_model == model
|
||||
# def test_should_get_model(
|
||||
# model_in_minio,
|
||||
# ):
|
||||
# model, object_name = model_in_minio
|
||||
# client = connect_minio()
|
||||
# received_model = get_model(
|
||||
# client=client,
|
||||
# object_name=object_name,
|
||||
# )
|
||||
# assert isinstance(model, Module)
|
||||
# assert received_model == model
|
||||
|
||||
|
||||
def test_should_put_model(
|
||||
model,
|
||||
):
|
||||
client = connect_minio()
|
||||
object_name = put_model(
|
||||
client=client,
|
||||
model=model,
|
||||
)
|
||||
assert isinstance(object_name, str)
|
||||
assert len(object_name) > 0
|
||||
received_model = get_model(
|
||||
client=client,
|
||||
object_name=object_name,
|
||||
)
|
||||
assert received_model == model
|
||||
# def test_should_put_model(
|
||||
# model,
|
||||
# ):
|
||||
# client = connect_minio()
|
||||
# object_name = put_model(
|
||||
# client=client,
|
||||
# model=model,
|
||||
# )
|
||||
# assert isinstance(object_name, str)
|
||||
# assert len(object_name) > 0
|
||||
# received_model = get_model(
|
||||
# client=client,
|
||||
# object_name=object_name,
|
||||
# )
|
||||
# assert received_model == model
|
||||
|
||||
|
||||
def test_should_update_model(
|
||||
model_in_minio,
|
||||
):
|
||||
model, object_name = model_in_minio
|
||||
client = connect_minio()
|
||||
object_name = put_model(
|
||||
client=client,
|
||||
model=model,
|
||||
)
|
||||
assert isinstance(object_name, str)
|
||||
assert len(object_name) > 0
|
||||
received_model = get_model(
|
||||
client=client,
|
||||
object_name=object_name,
|
||||
)
|
||||
assert received_model == model
|
||||
# def test_should_update_model(
|
||||
# model_in_minio,
|
||||
# ):
|
||||
# model, object_name = model_in_minio
|
||||
# client = connect_minio()
|
||||
# object_name = put_model(
|
||||
# client=client,
|
||||
# model=model,
|
||||
# )
|
||||
# assert isinstance(object_name, str)
|
||||
# assert len(object_name) > 0
|
||||
# received_model = get_model(
|
||||
# client=client,
|
||||
# object_name=object_name,
|
||||
# )
|
||||
# assert received_model == model
|
||||
|
||||
Reference in New Issue
Block a user