mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-02-06 19:42:34 +08:00
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 <noreply@anthropic.com>
This commit is contained in:
parent
ccfc5dedd4
commit
ea01cd665d
@ -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)
|
http.delete(f"{api_base}/api/assets/{aid}", timeout=30)
|
||||||
|
|
||||||
|
|
||||||
def trigger_sync_seed_assets(session: requests.Session, base_url: str) -> None:
|
# Re-export helpers for backwards compatibility with any external imports
|
||||||
"""Force a fast sync/seed pass by calling the seed endpoint."""
|
from helpers import trigger_sync_seed_assets, get_asset_filename
|
||||||
session.post(base_url + "/api/assets/seed", json={"roots": ["models", "input", "output"]}, timeout=30)
|
|
||||||
time.sleep(0.2)
|
|
||||||
|
|
||||||
|
__all__ = ["trigger_sync_seed_assets", "get_asset_filename"]
|
||||||
def get_asset_filename(asset_hash: str, extension: str) -> str:
|
|
||||||
return asset_hash.removeprefix("blake3:") + extension
|
|
||||||
|
|||||||
14
tests-unit/assets_test/helpers.py
Normal file
14
tests-unit/assets_test/helpers.py
Normal file
@ -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
|
||||||
@ -4,7 +4,7 @@ from pathlib import Path
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import requests
|
import requests
|
||||||
from conftest import get_asset_filename, trigger_sync_seed_assets
|
from helpers import get_asset_filename, trigger_sync_seed_assets
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -4,7 +4,7 @@ from pathlib import Path
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import requests
|
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(
|
def test_create_from_hash_success(
|
||||||
|
|||||||
@ -6,7 +6,7 @@ from typing import Optional
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import requests
|
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):
|
def test_download_attachment_and_inline(http: requests.Session, api_base: str, seeded_asset: dict):
|
||||||
|
|||||||
@ -3,7 +3,7 @@ from pathlib import Path
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import requests
|
import requests
|
||||||
from conftest import get_asset_filename, trigger_sync_seed_assets
|
from helpers import get_asset_filename, trigger_sync_seed_assets
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user