From 71b41dd9018ff09126943602c69a10bc19fe4a62 Mon Sep 17 00:00:00 2001 From: erinhmclark Date: Fri, 14 Feb 2025 10:05:32 +0000 Subject: [PATCH] Remove accidental path, yet again. --- tests/conftest.py | 5 ++--- .../metadata_enricher_ytshort_expected.pickle | Bin .../metadata_enricher_ytshort_input.pickle | Bin tests/enrichers/test_metadata_enricher.py | 4 ++-- tests/test_metadata.py | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) rename tests/data/{metadata => }/metadata_enricher_ytshort_expected.pickle (100%) rename tests/data/{metadata => }/metadata_enricher_ytshort_input.pickle (100%) diff --git a/tests/conftest.py b/tests/conftest.py index f7ed4b7..19e1f6b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -124,11 +124,10 @@ def pytest_runtest_setup(item): def unpickle(): """ Returns a helper function that unpickles a file - ** gets the file from the test_files directory: tests/data/test_files ** + ** gets the file from the test_files directory: tests/data/ ** """ def _unpickle(path): - test_data_dir = os.path.join(os.path.dirname(__file__), "data", "test_files") - with open(os.path.join(test_data_dir, path), "rb") as f: + with open(os.path.join("tests/data", path), "rb") as f: return pickle.load(f) return _unpickle diff --git a/tests/data/metadata/metadata_enricher_ytshort_expected.pickle b/tests/data/metadata_enricher_ytshort_expected.pickle similarity index 100% rename from tests/data/metadata/metadata_enricher_ytshort_expected.pickle rename to tests/data/metadata_enricher_ytshort_expected.pickle diff --git a/tests/data/metadata/metadata_enricher_ytshort_input.pickle b/tests/data/metadata_enricher_ytshort_input.pickle similarity index 100% rename from tests/data/metadata/metadata_enricher_ytshort_input.pickle rename to tests/data/metadata_enricher_ytshort_input.pickle diff --git a/tests/enrichers/test_metadata_enricher.py b/tests/enrichers/test_metadata_enricher.py index 9dc410b..c6190ed 100644 --- a/tests/enrichers/test_metadata_enricher.py +++ b/tests/enrichers/test_metadata_enricher.py @@ -79,8 +79,8 @@ def test_get_metadata_error_handling(mock_run, mock_logger_error, enricher): @pytest.mark.skip(reason="Requires ExifTool to be installed. TODO mock") def test_metadata_pickle(enricher, unpickle): # Uses a pickle of a YouTube short - metadata = unpickle("tests/data/metadata/metadata_enricher_ytshort_input.pickle") - expected = unpickle("tests/data/metadata/metadata_enricher_ytshort_expected.pickle") + metadata = unpickle("metadata_enricher_ytshort_input.pickle") + expected = unpickle("metadata_enricher_ytshort_expected.pickle") enricher.enrich(metadata) expected_media = expected.media actual_media = metadata.media diff --git a/tests/test_metadata.py b/tests/test_metadata.py index c6f3593..e1f7797 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -179,8 +179,8 @@ def test_choose_most_complete(): def test_choose_most_complete_from_pickles(unpickle): # test most complete from pickles before and after an enricher has run # Only compares length of media, not the actual media - m_before_enriching = unpickle("tests/data/metadata/metadata_enricher_ytshort_input.pickle") - m_after_enriching = unpickle("tests/data/metadata/metadata_enricher_ytshort_expected.pickle") + m_before_enriching = unpickle("metadata_enricher_ytshort_input.pickle") + m_after_enriching = unpickle("metadata_enricher_ytshort_expected.pickle") # Iterates `for r in results[1:]:` res = Metadata.choose_most_complete([Metadata(), m_after_enriching, m_before_enriching]) assert res.media == m_after_enriching.media