From 2b91dc95146a860e55f9b9003d0969527431f473 Mon Sep 17 00:00:00 2001 From: Patrick Robertson Date: Mon, 10 Mar 2025 16:51:16 +0000 Subject: [PATCH] Fix up unit tests --- tests/storages/test_local_storage.py | 3 +++ tests/storages/test_storage_base.py | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/storages/test_local_storage.py b/tests/storages/test_local_storage.py index 1fd6774..c3581df 100644 --- a/tests/storages/test_local_storage.py +++ b/tests/storages/test_local_storage.py @@ -32,12 +32,15 @@ def test_too_long_save_path(setup_module): setup_module("local_storage", {"save_to": "long"*100}) def test_get_cdn_url_relative(local_storage): + local_storage.filename_generator = "random" media = Media(filename="dummy.txt") local_storage.set_key(media, "https://example.com", Metadata()) expected = os.path.join(local_storage.save_to, media.key) assert local_storage.get_cdn_url(media) == expected def test_get_cdn_url_absolute(local_storage): + local_storage.filename_generator = "random" + media = Media(filename="dummy.txt") local_storage.save_absolute = True local_storage.set_key(media, "https://example.com", Metadata()) diff --git a/tests/storages/test_storage_base.py b/tests/storages/test_storage_base.py index 30a91b9..53dfbd7 100644 --- a/tests/storages/test_storage_base.py +++ b/tests/storages/test_storage_base.py @@ -32,6 +32,13 @@ class TestBaseStorage(Storage): def uploadf(self, file, key, **kwargs): return True +@pytest.fixture +def dummy_file(tmp_path): + # create dummy.txt file + dummy_file = tmp_path / "dummy.txt" + dummy_file.write_text("test content") + return str(dummy_file) + @pytest.fixture def storage_base(): def _storage_base(config): @@ -54,14 +61,11 @@ def storage_base(): ], ) -def test_storage_name_generation(storage_base, path_generator, filename_generator, url, expected_key, mocker): +def test_storage_name_generation(storage_base, path_generator, filename_generator, url, + expected_key, mocker, tmp_path, dummy_file): mock_random = mocker.patch("auto_archiver.core.storage.random_str") mock_random.return_value = "pretend-random" - # create dummy.txt file - with open("dummy.txt", "w") as f: - f.write("test content") - config: dict = { "path_generator": path_generator, "filename_generator": filename_generator, @@ -72,24 +76,20 @@ def test_storage_name_generation(storage_base, path_generator, filename_generato metadata = Metadata() metadata.set_context("folder", "folder") - media = Media(filename="dummy.txt") + media = Media(filename=dummy_file) storage.set_key(media, url, metadata) print(media.key) assert media.key == expected_key -def test_really_long_name(storage_base): +def test_really_long_name(storage_base, dummy_file): config: dict = { "path_generator": "url", "filename_generator": "static", } storage: Storage = storage_base(config) - # create dummy.txt file - with open("dummy.txt", "w") as f: - f.write("test content") - url = f"https://example.com/{'file'*100}" - media = Media(filename="dummy.txt") + media = Media(filename=dummy_file) storage.set_key(media, url, Metadata()) assert media.key == f"https-example-com-{'file'*13}/6ae8a75555209fd6c44157c0.txt" \ No newline at end of file