Peach: Local-first video metadata scraper and media manager.
fix(runtime): 按账本就绪状态启动后台任务并补齐错误回归
longmeidaob210fa86527b
diff --git a/.github/workflows/test.yml b/.github/workflows/test.ymlindex 73237b85d..1b13fcfc9 100644--- a/.github/workflows/test.yml+++ b/.github/workflows/test.yml@@ -147,7 +147,9 @@ jobs:uses: actions/upload-artifact@v7with:name: browser-${{ matrix.python }}-${{ matrix.scope }}-${{ matrix.shard_index }}- path: build/agent-verification/browser/*.tap+ path: |+ build/agent-verification/browser/*.tap+ build/agent-verification/browser/network/*.jsonif-no-files-found: ignore- name: 安装 macOS 依赖if: runner.os == 'macOS'@@ -247,7 +249,9 @@ jobs:uses: actions/upload-artifact@v7with:name: browser-web- path: build/agent-verification/browser/*.tap+ path: |+ build/agent-verification/browser/*.tap+ build/agent-verification/browser/network/*.jsonif-no-files-found: ignoreweb-vendor:diff --git a/docs/REUSE.md b/docs/REUSE.mdindex 358c0018a..4de9188dd 100644--- a/docs/REUSE.md+++ b/docs/REUSE.md@@ -102,6 +102,10 @@ JAV 作品详情与馆藏视频共用 `IdentityCell` 的头像、标识和首字`src/peach/diagnostics.py` 统一生成 CLI 与本机 API 报告;复用 `settings_file`、`health` 的只读迁移校验、`FFmpegResolver`、访问策略和挂载快照。数据库用 SQLite `mode=ro`;写入与端口检查用标准库短暂探针,不新增运行依赖。+应用生命周期复用 `health.inspect_database` 的只读账本与迁移检查;账本可读且结构为 `current` 时才恢复任务、启动追更、订阅、推送发现、下载对账和馆藏聚合预热。账本缺失、空白、损坏或迁移未就绪时保留健康与配置入口,只记录不含路径和 SQL 的状态提示,不创建或迁移账本;账本准备完成后重启服务。`/healthz?ready=1` 的 `checks.background` 反映本次生命周期是否启动了账本后台任务;暂缓启动的实例在重启前保持未就绪。配置与隧道测试复用标准库 `unittest.assertNoLogs` 检查非预期的后台错误,故障注入用 `assertLogs` 核对预期原因,生命周期回归使用 `support.ledger.fresh_ledger` 的真实迁移模板。没有新增依赖或真实 ledger 写入。++浏览器网络失败取证复用 Chromium(BSD)的 NetLog 与现有 Playwright 启动入口;`PEACH_E2E_NET_LOG_DIR` 启用 `--log-net-log`,捕获模式固定为 [`HeavilyRedacted`](https://chromium.googlesource.com/chromium/src/net/+/master/log/net_log_capture_mode.h),保留允许公开的网络事件字段,不采集 URL、主机、IP 或请求头。日志随浏览器正常关闭完成写入,由 CI 与 TAP 一起保存;失败请求仍使测试失败,不重试或过滤 `ERR_NO_BUFFER_SPACE`。番号样张夹具在首次导航前安装响应,直接打开目标页,并在主体等待失败时关闭 context。没有新增依赖或机器资源限额。+已核对 sakuramedia `a10fcef8`(GPL-3.0)的诊断字段与提示组织,仅作产品参考,不复制源码。OpenAver `8cc17e50`(MIT)的 HTTP 健康探针不足以表达分项状态。[fastapi-health 0.4.0](https://pypi.org/project/fastapi-health/)(MIT)在本机 Python 3.14.7 的离线试验中将状态字典视为真值;CLI、分级规则和脱敏仍需本项目处理,因此未引入。诊断页复用同一报告、TanStack Query、BoardUI 设置组合件及覆盖式滚动条。库健康参照 javm `dd0e6b62`(MIT)的计数→清单入口,采用 Peach 的资产、封面键与处理日志。来源证据复用 `performer_profile_followup` 成功落库来源与 `scraping_access.cooldown_state`,不复用 HTTP 200 作为内容健康。无新增依赖;本机只读试验已核对现有日志与成功记录。diff --git a/docs/TESTING.md b/docs/TESTING.mdindex ec01c825b..cb17ad3fb 100644--- a/docs/TESTING.md+++ b/docs/TESTING.md@@ -86,6 +86,8 @@ Windows 的路径、挂载、托盘、证书、进程编码、更新、认证及## 写什么测试+浏览器入口通过 `PEACH_E2E_NET_LOG_DIR` 保存 Chromium 网络事件日志;模式为 `HeavilyRedacted`,文件位于 `build/agent-verification/browser/network/`,CI 与 TAP 一起上传。网络请求失败仍使测试失败;排查 `ERR_NO_BUFFER_SPACE` 时同时核对 TAP 与该次浏览器的网络事件,不根据错误字样推断机器资源状态,也不添加放行重试。+测试应在用户可感知的行为错误时失败。页面的请求、缓存、选择、错误反馈和路由由组件测试与浏览器测试验证;CSS 层叠、主题、尺寸和交互后的样式由浏览器读取计算值。源码检查集中在通用规范、隐私边界、产物、依赖和跨语言常量一致性。组件名称、变量名、某个函数是否被调用、端点字面量出现几次和文档的具体措辞,不单独设门槛。一个失败模式优先在最便宜且能真实触发它的层验证;组件已验证的业务分支,不在 Python 中再逐段比对其源码。浏览器保留真实导航、布局、焦点与层叠等需要浏览器才能成立的检查。@@ -97,6 +99,7 @@ Windows 的路径、挂载、托盘、证书、进程编码、更新、认证及- 源码文本断言只减不增,由 `tests/test_source_assertion_ratchet.py` 按文件计数拦截。已有行为或浏览器验证的实现文本断言直接清退;确有行为缺口时才补用例,并同步降低基线。- 先列失败模式再写用例。异步请求的中间态用手动放行的 Promise 验证;假 fetch 在同一个 `act` 里就回话,会掩盖请求未完成时的时序问题。- 修缺陷先写一条会失败的用例,看它红了再修;修完按同一写法搜别处,有同类就收成共用实现。没有行为缺口的改动(文案、纯样式)不补回归用例。+- 使用应用 lifespan 的测试应显式准备账本状态:正常后台服务使用完整迁移的临时账本,缺失或迁移未就绪的场景验证后台服务保持停止。用 `assertNoLogs("peach", level="ERROR")` 覆盖服务启动、请求和正常退出;故障注入用 `assertLogs` 核对预期原因,不能仅凭接口返回成功放过非预期后台错误,也不能全局屏蔽错误日志。- 不写同义反复的用例:断言常量等于它自己、mock 掉被测对象再断言 mock 被调用,都证明不了什么。## 正式入口diff --git a/frontend/e2e/code-samples.test.ts b/frontend/e2e/code-samples.test.tsindex bebbd3331..52bbde8e8 100644--- a/frontend/e2e/code-samples.test.ts+++ b/frontend/e2e/code-samples.test.ts@@ -55,15 +55,24 @@ async function serveProfile(page: Page, local?: Local): Promise<number[]> {return offsets;}-async function openPhotos(browser: Browser, search: string, local?: Local): Promise<Visit & { offsets: number[] }> {- const opened = await visit(browser, '/', DESKTOP);- const offsets = await serveProfile(opened.page, local);- await opened.page.goto(new URL(`/performers/${encodeURIComponent(NAME)}?${search}`, opened.page.url()).href,- { waitUntil: 'load' });- await opened.page.locator('#index [data-entity-readout]', { hasText: '照片' })- .waitFor({ state: 'visible', timeout: 15_000 });- await settle(opened.page);- return { ...opened, offsets };+async function openPhotos(browser: Browser, search: string, local?: Local): Promise<Visit & { offsets: number[]; documents: string[] }> {+ let offsets: number[] = [];+ const documents: string[] = [];+ const opened = await visit(browser, `/performers/${encodeURIComponent(NAME)}?${search}`, DESKTOP, async page => {+ page.on('request', request => {+ if (request.isNavigationRequest() && request.frame() === page.mainFrame()) documents.push(request.url());+ });+ offsets = await serveProfile(page, local);+ });+ try {+ await opened.page.locator('#index [data-entity-readout]', { hasText: '照片' })+ .waitFor({ state: 'visible', timeout: 15_000 });+ await settle(opened.page);+ return { ...opened, offsets, documents };+ } catch (error) {+ await opened.close();+ throw error;+ }}/** 故意回 404 的那一张不算运行期问题,浏览器为它各记一条的控制台 404 也按条数扣掉;@@ -93,6 +102,8 @@ describe('番号样张', () => {const opened = await openPhotos(browser, 'media=photos');const { page } = opened;try {+ assert.equal(opened.documents.length, 1, '夹具直接打开目标资料页,页面只导航一次');+ assert.equal(new URL(opened.documents[0]).pathname, `/performers/${encodeURIComponent(NAME)}`);assert.equal(await page.locator('[data-entity-media] [data-media-view="photos"]').getAttribute('aria-pressed'),'true');assert.deepEqual(await groups(page), [['SSIS-057', 3], ['SSIS-001', 2]]);diff --git a/frontend/e2e/harness.ts b/frontend/e2e/harness.tsindex 7df5897b4..82bd91d43 100644--- a/frontend/e2e/harness.ts+++ b/frontend/e2e/harness.ts@@ -7,6 +7,9 @@* 用例只写语义断言(没有横向溢出、等待态会结束、控制台无错误),不做截图比对:* 单人部署里维护基线图的成本高于它能拦住的问题。 */import assert from 'node:assert/strict';+import { randomUUID } from 'node:crypto';+import { mkdirSync } from 'node:fs';+import { join } from 'node:path';import { chromium, type Browser, type BrowserContext, type Locator, type Page } from 'playwright-core';@@ -43,9 +46,18 @@ export function requiredEnv(name: string): string {}export async function launch(): Promise<Browser> {+ const args: string[] = [];+ const networkLogs = process.env.PEACH_E2E_NET_LOG_DIR;+ if (networkLogs) {+ mkdirSync(networkLogs, { recursive: true });+ const filename = `network-${process.pid}-${randomUUID()}.json`;+ args.push(`--log-net-log=${join(networkLogs, filename)}`, '--net-log-capture-mode=HeavilyRedacted');+ console.info(`浏览器网络事件日志:${filename}`);+ }return chromium.launch({headless: true,executablePath: requiredEnv('PEACH_E2E_CHROME'),+ args,// Windows 首次加载浏览器与系统组件使用独立的启动预算,页面等待由各用例限定。timeout: 60_000,});diff --git a/src/peach/api.py b/src/peach/api.pyindex 2871b65a3..1fe84deaa 100644--- a/src/peach/api.py+++ b/src/peach/api.py@@ -41,6 +41,7 @@ from .follow_covers import FollowCoverServicefrom .follow_faces import FollowFaceIndexfrom .follow_stream import FollowMediaResolverfrom .http import HttpxTransport+from .health import inspect_databasefrom .media import (FilesystemBackend,MediaEngine,@@ -154,9 +155,22 @@ WARM_AGGREGATES = (("/api/taste", {"window": "all"}), ("/api/review", {}), ("/ap("/api/follow", {}))-async def _warm_ledger_aggregates(settings: PeachSettings, contract) -> None:+def _start_ledger_services(settings: PeachSettings, contract, services) -> bool:+ """只读核对当前账本后,恢复任务并启动依赖账本的后台服务。"""+ status = inspect_database(settings.db_path)+ if not status["readable"] or status["schema"] != "current":+ LOGGER.warning("账本未就绪,依赖账本的后台任务保持停止(数据库:%s;结构:%s);账本准备完成后重启服务。",+ status["database"], status["schema"])+ return False+ _restore_task_center(contract)+ for service in services:+ service.start()+ return True+++async def _warm_ledger_aggregates(ledger_ready: bool, contract) -> None:"""走和真实请求同一条分派,缓存键一致,页面第一次打开就是现成的。"""- if not settings.configured:+ if not ledger_ready:returnfor path, args in WARM_AGGREGATES:try:@@ -324,16 +338,15 @@ def create_app(# 启动握手要等 cloudflared 连上边缘,可以占到几十秒;和 mDNS 一样交给线程,# 不要在事件循环里卡住整条服务的启动。await asyncio.to_thread(_start_tunnel, settings, tunnel_manager)+ ledger_ready = Falseif settings.configured:- _restore_task_center(contract)- follow_scheduler.start()- feed_scheduler.start()+ ledger_ready = _start_ledger_services(settings, contract,+ (follow_scheduler, feed_scheduler, push_discovery, downloads))automatic_updates.start()- push_discovery.start()- downloads.start()mount_reachability.start()+ _app.state.ledger_background_ready = ledger_readywarmup = asyncio.create_task(warm_startup_entries())- aggregate_warmup = asyncio.create_task(_warm_ledger_aggregates(settings, contract))+ aggregate_warmup = asyncio.create_task(_warm_ledger_aggregates(ledger_ready, contract))if mdns is not None:try:await asyncio.to_thread(mdns.start)@@ -484,7 +497,7 @@ def create_app(def healthz(request: Request, ready: bool = False):from .health import database_status, readinessif ready:- result = readiness(settings)+ result = readiness(settings, background_ready=getattr(request.app.state, "ledger_background_ready", None))return JSONResponse(result, status_code=200 if result["ready"] else 503,headers={"Cache-Control": "no-store"})# 不探测共享目录或迁移数据库;健康检查必须无副作用。diff --git a/src/peach/health.py b/src/peach/health.pyindex 53c5dee96..7e1e135e8 100644--- a/src/peach/health.py+++ b/src/peach/health.py@@ -58,9 +58,11 @@ def database_status(path) -> str:return inspect_database(path)["database"]-def readiness(settings: PeachSettings) -> dict:+def readiness(settings: PeachSettings, *, background_ready: bool | None = None) -> dict:checks = {"configured": bool(settings.configured),"web": settings.page_path.is_file(), "database": False, "schema": False}inspected = inspect_database(settings.db_path)checks.update(database=inspected["readable"], schema=inspected["schema"] == "current")+ if background_ready is not None:+ checks["background"] = background_readyreturn {"ready": all(checks.values()), "checks": checks}diff --git a/src/peach/task_runs.py b/src/peach/task_runs.pyindex 6de91efb6..d565ff84c 100644--- a/src/peach/task_runs.py+++ b/src/peach/task_runs.py@@ -259,7 +259,7 @@ class TaskRunStore:try:self.query(limit=1)return True- except sqlite3.OperationalError:+ except sqlite3.DatabaseError:return False# -- 写入 --------------------------------------------------------------diff --git a/tests/test_fastapi_api.py b/tests/test_fastapi_api.pyindex 8aa04d2aa..23c36602d 100644--- a/tests/test_fastapi_api.py+++ b/tests/test_fastapi_api.py@@ -7,7 +7,8 @@ import sqlite3import tempfileimport unittestfrom collections import OrderedDict-from contextlib import closing+from contextlib import asynccontextmanager, closing+from dataclasses import replacefrom pathlib import Pathfrom unittest.mock import patchfrom types import SimpleNamespace@@ -3151,6 +3152,88 @@ class UnconfiguredMachineTests(unittest.IsolatedAsyncioTestCase):self.assertFalse(response.json()["configured"])self.assertFalse(self.settings.db_path.exists())+ @asynccontextmanager+ async def ledger_client(self, database):+ from peach import settings_file+ config = settings_file.load_config(environ={"PEACH_DATA_ROOT": str(database.parent.parent)})+ config = replace(config, locations={}, mounts={})+ settings = replace(self.settings, configured=True, db_path=database,+ page_path=ROOT / "web/index.html", secrets_root=database.parent / "secrets",+ tunnel_state_root=database.parent / "tunnel-state",+ tunnel_log_root=database.parent / "logs")+ with patch("peach.settings_file.load_config", return_value=config), \+ patch("peach.routes_configuration.managed_configuration", return_value=False), \+ self.assertNoLogs("peach", level="ERROR"):+ app = create_app(settings)+ async with app.router.lifespan_context(app), httpx.AsyncClient(+ transport=httpx.ASGITransport(app=app), base_url="http://test",+ ) as client:+ yield app, client++ async def test_unready_ledgers_keep_background_workers_stopped_without_creating_or_migrating_data(self):+ parent = self.settings.db_path.parent+ parent.mkdir(parents=True)+ for state in ("missing", "empty", "corrupt", "pending", "mismatch"):+ with self.subTest(state=state):+ database = parent / f"{state}.db"+ if state == "empty":+ with closing(sqlite3.connect(database)):+ pass+ elif state == "corrupt":+ database.write_bytes(b"not a sqlite database")+ elif state in {"pending", "mismatch"}:+ fresh_ledger(parent, database.name)+ with closing(sqlite3.connect(database)) as connection, connection:+ if state == "pending":+ connection.execute("DELETE FROM schema_migration WHERE version=(SELECT MAX(version) FROM schema_migration)")+ else:+ connection.execute("UPDATE schema_migration SET checksum='wrong' WHERE version=(SELECT MAX(version) FROM schema_migration)")+ original = database.read_bytes() if database.exists() else None+ with self.assertLogs("peach.api", level="WARNING") as captured:+ async with self.ledger_client(database) as (app, client):+ self.assertIsNone(app.state.web_contract.downloads._thread)+ self.assertFalse(app.state.follow_scheduler._started)+ self.assertFalse(app.state.web_contract.feed_scheduler._started)+ self.assertEqual((await client.get("/healthz")).status_code, 200)+ ready = await client.get("/healthz?ready=1")+ self.assertEqual(ready.status_code, 503)+ self.assertFalse(ready.json()["ready"])+ self.assertEqual([record.levelname for record in captured.records], ["WARNING"])+ self.assertIn("账本准备完成后重启服务", captured.output[0])+ self.assertNotIn(str(database), captured.output[0])+ self.assertEqual(database.read_bytes() if database.exists() else None, original)++ async def test_current_ledger_starts_background_workers_and_stops_them_with_the_service(self):+ parent = self.settings.db_path.parent+ parent.mkdir(parents=True)+ database = fresh_ledger(parent)+ async with self.ledger_client(database) as (app, client):+ self.assertIsNotNone(app.state.web_contract.downloads._thread)+ self.assertTrue(app.state.follow_scheduler._started)+ self.assertTrue(app.state.web_contract.feed_scheduler._started)+ ready = await client.get("/healthz?ready=1")+ self.assertEqual(ready.status_code, 200)+ self.assertTrue(ready.json()["ready"])+ self.assertIsNone(app.state.web_contract.downloads._thread)+ self.assertFalse(app.state.follow_scheduler._started)+ self.assertFalse(app.state.web_contract.feed_scheduler._started)++ async def test_preparing_the_ledger_requires_a_service_restart_to_resume_background_work(self):+ parent = self.settings.db_path.parent+ parent.mkdir(parents=True)+ database = parent / "ledger.db"+ async with self.ledger_client(database) as (app, client):+ self.assertIsNone(app.state.web_contract.downloads._thread)+ fresh_ledger(parent)+ response = await client.get("/healthz?ready=1")+ self.assertEqual(response.status_code, 503)+ self.assertFalse(response.json()["checks"]["background"])+ async with self.ledger_client(database) as (app, client):+ response = await client.get("/healthz?ready=1")+ self.assertEqual(response.status_code, 200)+ self.assertTrue(response.json()["checks"]["background"])+ self.assertIsNotNone(app.state.web_contract.downloads._thread)+async def test_the_page_serves_the_first_run_shell(self):response = await self.client.get("/")self.assertEqual(response.status_code, 200)diff --git a/tests/test_follow_scheduler.py b/tests/test_follow_scheduler.pyindex 68c5375dd..71cceb55e 100644--- a/tests/test_follow_scheduler.py+++ b/tests/test_follow_scheduler.py@@ -103,7 +103,9 @@ class FollowUpdateSchedulerTests(unittest.TestCase):MAX_INTERVAL_MINUTES))scheduler._run()self.assertEqual(scheduler.status()["consecutive_failures"], 1)- scheduler._run()+ with self.assertLogs("peach.follow_scheduler", level="ERROR") as captured:+ scheduler._run()+ self.assertIn("上游断了", "\n".join(captured.output))status = scheduler.status()self.assertEqual(status["consecutive_failures"], 2)self.assertEqual(status["last_error"], "上游断了")diff --git a/tests/test_followups.py b/tests/test_followups.pyindex ef368cd7e..439f4f3f5 100644--- a/tests/test_followups.py+++ b/tests/test_followups.py@@ -223,7 +223,9 @@ class RunnerTests(LedgerTestCase):queued = self.store.enqueue_followups(parent.id, [("entity-avatar:performer:1", AVATAR_TASK_KEY, "甲")])["queued"]self.store.finish(parent.id, "succeeded", summary={"followups": 1})- FollowupRunner(self.contract()).drain()+ with self.assertLogs("peach.followups", level="WARNING") as captured:+ FollowupRunner(self.contract()).drain()+ self.assertIn("取不到这张图", "\n".join(captured.output))child = self.store.get(queued[0])self.assertEqual(child.status, "failed")self.assertIn("取不到这张图", child.error)diff --git a/tests/test_metadata_performer_profiles.py b/tests/test_metadata_performer_profiles.pyindex 941a94563..0e192d057 100644--- a/tests/test_metadata_performer_profiles.py+++ b/tests/test_metadata_performer_profiles.py@@ -136,10 +136,12 @@ class ImportedPerformerProfileTests(unittest.TestCase):raise OSError("connection reset")issues = []- result = enrich_performer_profiles(- self.database, [self.group()], self.root / "avatars", self.root / "providers",- transport_factory=lambda: refuse,- issue=lambda asset_id, message: issues.append((asset_id, message)))+ with self.assertLogs("peach.metadata_performer_profiles", level="WARNING") as captured:+ result = enrich_performer_profiles(+ self.database, [self.group()], self.root / "avatars", self.root / "providers",+ transport_factory=lambda: refuse,+ issue=lambda asset_id, message: issues.append((asset_id, message)))+ self.assertIn("connection reset", "\n".join(captured.output))self.assertEqual(result["failed"], 1)self.assertEqual(result["avatars"], 0)self.assertEqual([asset_id for asset_id, _message in issues], [1])diff --git a/tests/test_onboarding.py b/tests/test_onboarding.pyindex ee7a86bff..7f641372b 100644--- a/tests/test_onboarding.py+++ b/tests/test_onboarding.py@@ -13,6 +13,7 @@ import osimport sqlite3import tempfileimport unittest+from contextlib import contextmanagerfrom pathlib import Pathfrom unittest import mock@@ -891,6 +892,7 @@ class StandaloneConfigurationTests(_Case):self.config.data_root, self.config.path, True, True,settings_file._read_document(self.config.path), {})).start()+ @contextmanagerdef client(self, *, token="test-token", address="127.0.0.1", base_url="http://localhost", server=None):from fastapi.testclient import TestClientfrom peach.api import create_app@@ -903,7 +905,9 @@ class StandaloneConfigurationTests(_Case):async def connection_address(request, call_next):request.scope["server"] = (server, 443)return await call_next(request)- return TestClient(app, client=(address, 12345), base_url=base_url)+ with self.assertNoLogs("peach", level="ERROR"), \+ TestClient(app, client=(address, 12345), base_url=base_url) as client:+ yield clientdef test_local_mdns_connection_shares_configuration_access_for_read_save_and_picker(self):headers = {"X-Token": "test-token"}diff --git a/tests/test_push_discovery.py b/tests/test_push_discovery.pyindex 17f85a774..3d5dba377 100644--- a/tests/test_push_discovery.py+++ b/tests/test_push_discovery.py@@ -266,7 +266,9 @@ class QueueTests(unittest.TestCase):debounce=0.0, settle=0.0)queue.submit("local", "p", 0.0)queue.tick(0.0)- queue.tick(0.0)+ with self.assertLogs("peach.push_discovery", level="ERROR") as captured:+ queue.tick(0.0)+ self.assertIn("账本忙", "\n".join(captured.output))self.assertEqual(queue.snapshot()["failed"], 1)self.assertIn("账本忙", queue.snapshot()["last_error"])diff --git a/tests/test_task_runs.py b/tests/test_task_runs.pyindex a7bddf03b..5eb5e0fb0 100644--- a/tests/test_task_runs.py+++ b/tests/test_task_runs.py@@ -39,6 +39,17 @@ class TaskRunStoreTests(unittest.TestCase):self.assertEqual(run.pid, os.getpid())self.assertEqual(self.store.get(run.id).progress_label, "准备")+ def test_missing_empty_or_corrupt_ledgers_have_no_available_task_center(self):+ self.assertTrue(self.store.available())+ for state, content in (("missing", None), ("empty", b""), ("corrupt", b"not a sqlite database")):+ with self.subTest(state=state):+ path = self.db.parent / f"{state}.db"+ if content is not None:+ path.write_bytes(content)+ store = TaskRunStore(LedgerDatabase(path), host="test-host")+ self.assertFalse(store.available())+ self.assertEqual(path.read_bytes() if path.exists() else None, content)+def test_scheduled_conflict_is_skipped_and_says_who_blocked_it(self):first = self.store.start("demo", trigger="manual", mutex_key="demo")self.assertIsNone(self.store.start(diff --git a/tests/test_tunnel.py b/tests/test_tunnel.pyindex 726fb0366..90a0d7740 100644--- a/tests/test_tunnel.py+++ b/tests/test_tunnel.py@@ -894,7 +894,8 @@ class TunnelStartupTests(unittest.TestCase):db_path=self.root / "peach.db", configured=True, token="",tunnel_state_root=self.root / "state", tunnel_log_root=self.root / "logs",)- with TestClient(api.create_app(settings, tunnel_manager=manager)) as client:+ with self.assertNoLogs("peach", level="ERROR"), \+ TestClient(api.create_app(settings, tunnel_manager=manager)) as client:client.get("/healthz")manager.start.assert_not_called()diff --git a/tests/test_web_e2e.py b/tests/test_web_e2e.pyindex 30db251ef..360b8d225 100644--- a/tests/test_web_e2e.py+++ b/tests/test_web_e2e.py@@ -313,7 +313,7 @@ class WebE2ESmokeTests(unittest.TestCase):def test_every_route_holds_the_layout_and_runtime_invariants(self):env = dict(os.environ, PEACH_E2E_ORIGIN=self.origin, PEACH_E2E_ITEM=str(self.item),- PEACH_E2E_CHROME=self.chrome)+ PEACH_E2E_CHROME=self.chrome, PEACH_E2E_NET_LOG_DIR=str(BROWSER_LOGS / "network"))BROWSER_LOGS.mkdir(parents=True, exist_ok=True)for stale in BROWSER_LOGS.glob("batch-*.tap"):stale.unlink()@@ -416,7 +416,7 @@ class SetupE2ETests(unittest.TestCase):self.assertFalse((self.data / settings_file.SETTINGS_FILENAME).exists())env = dict(os.environ, PEACH_E2E_SETUP_ORIGIN=self.origin, PEACH_E2E_SETUP_MEDIA=str(self.media),PEACH_E2E_SETUP_DATA=str(self.data), PEACH_E2E_SETUP_LEDGER_ROOT=self.ledger_root,- PEACH_E2E_CHROME=self.chrome)+ PEACH_E2E_CHROME=self.chrome, PEACH_E2E_NET_LOG_DIR=str(BROWSER_LOGS / "network"))BROWSER_LOGS.mkdir(parents=True, exist_ok=True)log_path = BROWSER_LOGS / "setup.tap"try: