diff options
Diffstat (limited to 'lib/project/tests/test_gui_jobs.py')
| -rw-r--r-- | lib/project/tests/test_gui_jobs.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/lib/project/tests/test_gui_jobs.py b/lib/project/tests/test_gui_jobs.py index 6116a72..d44772f 100644 --- a/lib/project/tests/test_gui_jobs.py +++ b/lib/project/tests/test_gui_jobs.py @@ -7,8 +7,6 @@ import time import pytest from producer import gui_jobs, setup -from producer.gui import rooted - def terminal(jobs, job_id): deadline = time.monotonic() + 10 @@ -34,13 +32,13 @@ def test_single_worker_bounded_queue_and_running_process_cancellation(wav, tmp_p "Waiting for worker", progress) return {"bins": 2048} monkeypatch.setattr(gui_jobs, "waveform", slow_scan) - jobs = gui_jobs.Jobs(tmp_path, lambda value: rooted(tmp_path, value)) - snapshot = {"path": source.name, "input_id": gui_jobs.identity(source)} + jobs = gui_jobs.Jobs() + snapshot = {"upload_id": jobs.register_upload(source, source.name), "input_id": gui_jobs.identity(source)} try: first = jobs.submit("scan", snapshot) assert started.wait(5) # Public snapshots cannot mutate the immutable in-flight job. - first["snapshot"]["path"] = "missing.wav" + first["snapshot"]["name"] = "renamed.wav" queued = [jobs.submit("scan", snapshot) for _ in range(3)] with pytest.raises(gui_jobs.Busy): jobs.submit("scan", snapshot) @@ -71,8 +69,8 @@ def test_history_and_result_cache_are_bounded_and_evicted_media_expires(wav, tmp (work / "processed.wav").write_bytes(b"preview") return {} monkeypatch.setattr(gui_jobs, "render_preview", preview) - jobs = gui_jobs.Jobs(tmp_path, lambda value: rooted(tmp_path, value)) - snapshot = {"path": source.name, "input_id": gui_jobs.identity(source)} + jobs = gui_jobs.Jobs() + snapshot = {"upload_id": jobs.register_upload(source, source.name), "input_id": gui_jobs.identity(source)} try: results = [] for index in range(10): @@ -82,7 +80,7 @@ def test_history_and_result_cache_are_bounded_and_evicted_media_expires(wav, tmp results.append(result["result"]["result_id"]) assert len(jobs.list()) == 5 assert len(jobs.cache) == 2 - assert len(list(jobs.work.iterdir())) == 2 + assert len([item for item in jobs.work.iterdir() if item.name != "uploads"]) == 2 with pytest.raises(KeyError): jobs.media(results[0], "original") assert jobs.media(results[-1], "original") == b"preview" @@ -93,7 +91,7 @@ def test_history_and_result_cache_are_bounded_and_evicted_media_expires(wav, tmp with jobs.condition: jobs._evict() assert not jobs.cache - assert not list(jobs.work.iterdir()) + assert not [item for item in jobs.work.iterdir() if item.name != "uploads"] finally: jobs.close() @@ -107,8 +105,8 @@ def test_queued_input_replacement_is_rejected_and_shutdown_cancels_scan(wav, tmp progress("Scanning", 1, 10) time.sleep(0.01) monkeypatch.setattr(gui_jobs, "waveform", scan) - jobs = gui_jobs.Jobs(tmp_path, lambda value: rooted(tmp_path, value)) - snapshot = {"path": source.name, "input_id": gui_jobs.identity(source)} + jobs = gui_jobs.Jobs() + snapshot = {"upload_id": jobs.register_upload(source, source.name), "input_id": gui_jobs.identity(source)} running = jobs.submit("scan", snapshot) assert started.wait(5) queued = jobs.submit("scan", snapshot) |