From ea01cd665daba72b5afd6b62c3678d4fcacbe6e6 Mon Sep 17 00:00:00 2001 From: Luke Mino-Altherr Date: Tue, 3 Feb 2026 14:57:52 -0800 Subject: [PATCH] fix: resolve test import errors and module collision in assets_test Extract helper functions from conftest.py to a dedicated helpers.py module to fix import resolution issues when pytest processes subdirectories. Rename test_tags.py to test_tags_api.py to avoid module name collision with queries/test_tags.py. Co-Authored-By: Claude Opus 4.5 --- tests-unit/assets_test/conftest.py | 10 +++------- tests-unit/assets_test/helpers.py | 14 ++++++++++++++ tests-unit/assets_test/test_assets_missing_sync.py | 2 +- tests-unit/assets_test/test_crud.py | 2 +- tests-unit/assets_test/test_downloads.py | 2 +- .../assets_test/test_prune_orphaned_assets.py | 2 +- .../assets_test/{test_tags.py => test_tags_api.py} | 0 7 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 tests-unit/assets_test/helpers.py rename tests-unit/assets_test/{test_tags.py => test_tags_api.py} (100%) diff --git a/tests-unit/assets_test/conftest.py b/tests-unit/assets_test/conftest.py index 0a57dd7b5..53a747108 100644 --- a/tests-unit/assets_test/conftest.py +++ b/tests-unit/assets_test/conftest.py @@ -261,11 +261,7 @@ def autoclean_unit_test_assets(http: requests.Session, api_base: str): http.delete(f"{api_base}/api/assets/{aid}", timeout=30) -def trigger_sync_seed_assets(session: requests.Session, base_url: str) -> None: - """Force a fast sync/seed pass by calling the seed endpoint.""" - session.post(base_url + "/api/assets/seed", json={"roots": ["models", "input", "output"]}, timeout=30) - time.sleep(0.2) +# Re-export helpers for backwards compatibility with any external imports +from helpers import trigger_sync_seed_assets, get_asset_filename - -def get_asset_filename(asset_hash: str, extension: str) -> str: - return asset_hash.removeprefix("blake3:") + extension +__all__ = ["trigger_sync_seed_assets", "get_asset_filename"] diff --git a/tests-unit/assets_test/helpers.py b/tests-unit/assets_test/helpers.py new file mode 100644 index 000000000..1a486581b --- /dev/null +++ b/tests-unit/assets_test/helpers.py @@ -0,0 +1,14 @@ +"""Helper functions for assets integration tests.""" +import time + +import requests + + +def trigger_sync_seed_assets(session: requests.Session, base_url: str) -> None: + """Force a fast sync/seed pass by calling the seed endpoint.""" + session.post(base_url + "/api/assets/seed", json={"roots": ["models", "input", "output"]}, timeout=30) + time.sleep(0.2) + + +def get_asset_filename(asset_hash: str, extension: str) -> str: + return asset_hash.removeprefix("blake3:") + extension diff --git a/tests-unit/assets_test/test_assets_missing_sync.py b/tests-unit/assets_test/test_assets_missing_sync.py index 78fa7b404..47dc130cb 100644 --- a/tests-unit/assets_test/test_assets_missing_sync.py +++ b/tests-unit/assets_test/test_assets_missing_sync.py @@ -4,7 +4,7 @@ from pathlib import Path import pytest import requests -from conftest import get_asset_filename, trigger_sync_seed_assets +from helpers import get_asset_filename, trigger_sync_seed_assets diff --git a/tests-unit/assets_test/test_crud.py b/tests-unit/assets_test/test_crud.py index d2b69f475..43b4863ae 100644 --- a/tests-unit/assets_test/test_crud.py +++ b/tests-unit/assets_test/test_crud.py @@ -4,7 +4,7 @@ from pathlib import Path import pytest import requests -from conftest import get_asset_filename, trigger_sync_seed_assets +from helpers import get_asset_filename, trigger_sync_seed_assets def test_create_from_hash_success( diff --git a/tests-unit/assets_test/test_downloads.py b/tests-unit/assets_test/test_downloads.py index cdebf9082..42c64a5fd 100644 --- a/tests-unit/assets_test/test_downloads.py +++ b/tests-unit/assets_test/test_downloads.py @@ -6,7 +6,7 @@ from typing import Optional import pytest import requests -from conftest import get_asset_filename, trigger_sync_seed_assets +from helpers import get_asset_filename, trigger_sync_seed_assets def test_download_attachment_and_inline(http: requests.Session, api_base: str, seeded_asset: dict): diff --git a/tests-unit/assets_test/test_prune_orphaned_assets.py b/tests-unit/assets_test/test_prune_orphaned_assets.py index f602e5a77..1fbd4d4e2 100644 --- a/tests-unit/assets_test/test_prune_orphaned_assets.py +++ b/tests-unit/assets_test/test_prune_orphaned_assets.py @@ -3,7 +3,7 @@ from pathlib import Path import pytest import requests -from conftest import get_asset_filename, trigger_sync_seed_assets +from helpers import get_asset_filename, trigger_sync_seed_assets @pytest.fixture diff --git a/tests-unit/assets_test/test_tags.py b/tests-unit/assets_test/test_tags_api.py similarity index 100% rename from tests-unit/assets_test/test_tags.py rename to tests-unit/assets_test/test_tags_api.py