From b2967d867cc0bcb5a4b33c1821afcf7b22b9a24c Mon Sep 17 00:00:00 2001 From: ukr8b3g-cmyk Date: Sun, 4 Oct 2026 19:28:11 +0900 Subject: [PATCH] test: distinguish real-Core integration from standalone CI --- MANIFEST.sha256 | 8 ++++---- WORKLOG.md | 2 ++ tests/conftest.py | 12 ++++++++++++ tests/test_v39_stability_r1.py | 4 +++- tests/test_v39_stability_r2.py | 2 +- tests/test_v39_stability_r4_r5.py | 4 ++-- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/MANIFEST.sha256 b/MANIFEST.sha256 index 5995925..68bd6b1 100644 --- a/MANIFEST.sha256 +++ b/MANIFEST.sha256 @@ -147,7 +147,7 @@ caa572ea65dafc86850db99f52433d360ac9c4ab36b854292a3dccd5ba32dc76 reference.py 6056de6c0a5322a8a51ba5a114538dca2ef67788cd1afba10fedd483b95f6afa state_io.py 3a359a0467725cc292ccb4c86cf0c3d30bb6a114d01f5345792b09ea3d45441d state.py 43ec4023dc06c941e5d7a04db4b8a89fb58d744ceb986f6eb9bf534d4fdcb87b temporal.py -0c10bed921279860b0c9f330a4d4c2ec619f8bdf1bbcaff0a49f81c4dc693063 tests/conftest.py +8a50f5ad8a7f100eb029d74999999270eb52fbffa1be43625150c3b11bf1a72c tests/conftest.py 7f34c43ea74c43cfc4f9453848c69c8ed7546de5b78c7c7d063d643f2c483c36 tests/decode_cache/conftest.py 8d0cced8c945c4333ef78688b51a988d7e1d560e5f9e6cceec8310b17c98ad53 tests/decode_cache/helpers/cache_process_worker.py a41a4de12e6fe5690845f9f0795fa82c4907f0afe2551034fa2a4c95617ac39c tests/decode_cache/test_adapter_nodes.py @@ -422,8 +422,8 @@ a9f7b67bd65a9beda622aa5fdc5f8a2ecae1b58b18690d91fb0107a16a3e384e write-h3-v39-r 8b8ca1b0c802d024c6915d903747d8722bea25628369997ab008ff896462b96a tests/fixtures/v39_sampling_v5/revisions/d8352287737286e5/chunks/rev-d8352287737286e5-txn-008f52b93a88461481ead25f91627af0-chunk-0002.safetensors 26e771cffc57f171f4cc4c6859876350bdf717d1e8213fc005343006a34f002f tests/fixtures/v39_sampling_v5/revisions/d8352287737286e5/chunks/rev-d8352287737286e5-txn-9bb0a584b7344342b114bd31b175225c-chunk-0001.safetensors 7bf0cf46f049e072a68e71cf8bbab10aef695f0931b16842a890c084021f5a11 tests/fixtures/v39_sampling_v5/revisions/d8352287737286e5/manifest.json -2e09cde80073085ac6dda5cdaf50ea9d76f1c9db15cd1b444e13e50cea8fe210 tests/test_v39_stability_r1.py -d924698cdaea82dd7212d356e368cf9701231c6a4d1f9794f1e28e7b36125124 tests/test_v39_stability_r2.py +49e525a86e23b26afd1008193aac510812cd2ba330d6b5b52023ab93d662ae27 tests/test_v39_stability_r1.py +b27004f82a3c551926e7e8f5bfa140af1eb2a1cf39ee5660f1d5b2495cf474ed tests/test_v39_stability_r2.py d2e59eae0a724626b0a4e361921643dd31cb3612ae1f0d1b8b355c9d42c06174 tests/test_v39_stability_r3.py -1dc932ec0ee825a8ad95509824d225c6bd091344229da7e1ff361b7512f190d9 tests/test_v39_stability_r4_r5.py +072091309b35ff5c204c49ed478d9cdcc39d316df15a6209f687b33d13bbf790 tests/test_v39_stability_r4_r5.py 319258798ca198312cf684f369990924657d1af168a148ad34303af31c06a350 tests/test_v39_review_refine_scope.py diff --git a/WORKLOG.md b/WORKLOG.md index df036cf..357c348 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -10,5 +10,7 @@ - Targeted Review Second Pass and integrated generation/reuse GPU checks passed. Browser acceptance remains pending; optional latent-upscale artifacts remain a separate issue. - Put the patch summary and v5-to-v6 restart instructions at the beginning of both language READMEs. - Replace workstation paths and private operational history in public documentation with portable instructions and public validation summaries. Original development records are preserved outside the publication checkout. +- Mark the eighteen real-Core integration cases as dependency skips in standalone CI when ComfyUI Core is absent. They still execute with Core installed; broken Core dependencies remain test failures. Production code is unchanged. +- Release-preparation checks for the affected tests and package metadata: 66 passed with real Core; 48 passed / 18 dependency skips without Core. Both CPU gates had zero CUDA initialization attempts. Earlier product behavior is described in CHANGELOG.md and the historical Release/tag versions. This log contains public engineering summaries rather than private operational records. diff --git a/tests/conftest.py b/tests/conftest.py index 2718131..4a424c5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,5 +1,6 @@ from __future__ import annotations +import importlib import importlib.util import sys from pathlib import Path @@ -27,6 +28,17 @@ import subprocess import pytest +@pytest.fixture +def require_comfy_core(): + """Only skip integration cases when the standalone checkout lacks Core.""" + try: + importlib.import_module("comfy") + except ModuleNotFoundError as error: + if error.name != "comfy": + raise + pytest.skip("Requires an installed ComfyUI Core; standalone CI has no Core") + + @pytest.fixture(scope="session") def review_queue_results(): node = shutil.which("node") diff --git a/tests/test_v39_stability_r1.py b/tests/test_v39_stability_r1.py index 6fd3e77..0a442b1 100644 --- a/tests/test_v39_stability_r1.py +++ b/tests/test_v39_stability_r1.py @@ -12,7 +12,9 @@ def group(keyframe): @pytest.mark.parametrize('resize',[False,True]) @pytest.mark.parametrize('kind',['audio','video','mixed']) -def test_modalities_preserve_audio_and_frozen_source(kind,resize): +def test_modalities_preserve_audio_and_frozen_source(kind,resize,request): + if resize and kind!='audio': + request.getfixturevalue('require_comfy_core') keyframe={'resolved_frame_index':0} if kind!='video': keyframe['audio_latent']=torch.arange(32*2*7).reshape(1,32,2,7).float() if kind!='audio': keyframe['latent']=torch.ones(1,24,1,2,3) diff --git a/tests/test_v39_stability_r2.py b/tests/test_v39_stability_r2.py index 5b9e01d..a9d5c68 100644 --- a/tests/test_v39_stability_r2.py +++ b/tests/test_v39_stability_r2.py @@ -131,7 +131,7 @@ def test_signature_failure_is_diagnostic_not_a_generation_stop(): assert contract and not safe and reasons -def test_core_euler_sampler_has_an_observable_runtime_signature(): +def test_core_euler_sampler_has_an_observable_runtime_signature(require_comfy_core): from comfy.samplers import sampler_object _, safe = storage._sampler_signature(sampler_object("euler")) assert safe diff --git a/tests/test_v39_stability_r4_r5.py b/tests/test_v39_stability_r4_r5.py index 94ae629..0c912bb 100644 --- a/tests/test_v39_stability_r4_r5.py +++ b/tests/test_v39_stability_r4_r5.py @@ -19,7 +19,7 @@ def test_equal_rate_returns_original_without_importing_a_resampler(monkeypatch): @pytest.mark.parametrize("rate", [16000, 22050, 32000, 44100, 48000, 96000]) @pytest.mark.parametrize("channels", [1, 2]) -def test_resample_is_exactly_core(rate, channels): +def test_resample_is_exactly_core(rate, channels, require_comfy_core): from comfy.audio import resample waveform = torch.sin(torch.arange(rate // 10, dtype=torch.float32) * 0.0123).view(1, 1, -1).repeat(1, channels, 1) frozen = waveform.clone() @@ -75,7 +75,7 @@ def test_errors_never_switch_silently_to_a_different_resampler(monkeypatch, fail @pytest.mark.parametrize("rate", [32000, 44100, 48000]) -def test_reference_bundle_and_driving_do_not_require_torchaudio(rate, monkeypatch): +def test_reference_bundle_and_driving_do_not_require_torchaudio(rate, monkeypatch, require_comfy_core): original_import = builtins.__import__ def no_torchaudio(name, *args, **kwargs): if name == "torchaudio" or name.startswith("torchaudio."):