Files
codex-app-server/cloud/tests/test_server_goal_notify.py
host f39ed3654e ci3: lint/mypy 第二阶段清理 + 覆盖率 76% -> 78%(门槛不动)
基底:#251 头 174b631(堆叠于 #242 feat-ci-expand 之上),
基线 origin/main aebc6238;本轨不改 #251 已定语义、不动
workflow 门槛、不删检查、不加 skip。

lint(ruff E,F@120):109 -> 10
- F401 43 -> 0:删未用导入;try/except 双绑定的名字出现
  “打地鼠”(删 except 分支后 try 分支又被标出),两分支
  均已核对正文无引用后清掉;MCP 三模块的 Error 名不删,
  改走 importlib 属性绑定(见下),两路径绑定都保留。
- E702 40 -> 0:全在 host.py main() 的 argparse 段,纯分行,
  tokenize 按分号 token 拆(含 2377 行多行语句只断首个分号);
  一次 5 空格缩进失误已回滚重做并以 ast + 全量 host 测试验证。
- E501 13 -> 0:host.py 5 项随 E702 分行连带清掉;mcp_server
  3 项把描述拆成相邻字面量(AST 比对 24 条工具描述与原值
  完全一致,注意 ruff 按东亚宽度计长,CJK 算 2);test_host
  5 项断开 git commit 参数表。
- E402 8 -> 10:生产侧 2 项清掉(db.py _re、github_app
  _base64 移到顶部,之前无引用、无重名);剩余 10 项全是
  tests/ 的 sys.path 前置 import(6 项旧 + 4 个新测试文件
  沿用同一既定模式),移上去会破坏单文件直跑,有意保留。
- F841 4 -> 0:只去绑定、不删调用(run_task、DB 入队、
  tarfile 上下文、git 提交),各有注释与原测试/新测试覆盖;
  host dispatch_from_branch 新增真实 git 仓库回归测试。
- F811 1 -> 0:server 本地 _row_get 与 peer_messages.row_get
  逐行相同,删本地定义,全部调用点解析到同一 import;
  新增 test_server_row_get(同一对象 + 三路行为)。

mypy(生产范围):24 -> 0,零新增 type: ignore
- no-redef 9 -> 0:MCP 三模块 try/except 两次 from-import
  改 importlib.import_module + 属性绑定(cloud 优先、flat
  copy 回落、内层 ImportError 同样回落,语义与原来一致;
  flat-copy 子进程测试证实回落后 __module__ 为顶层名);
  server _row_get 随 F811 消除。
- arg-type 10 -> 0:harness2_tasks shared 改 TypedDict
  逐键精确类型;CodexProbeAdapter 补 no-op validate_tree
  (_adapter_validate 本就跳过缺失方法,行为一致)。
- var-annotated 3 -> 0:sub2api _SHARED_ADMIN/_login_slots、
  verify-multiuser RESULTS 加精确注解。
- assignment/misc 2 -> 0:marker_tools ZoneInfo 先声明
  Any 再 try import(草稿先验 mypy 通过)。

bandit:总数 286 不变,High 仍 4 项,全在 host.py,本轨不改
(属第 3 项白名单轨范围),只做 triage:
- 1319 run_verify:无插值,整串验测命令,管道/&& 须 shell
  语义(新增 test_host_run_verify 断言管道与 && 真实生效)。
- 1497 notify:模板来自算子配置,三处插值全部 shlex.quote,
  证据为既有 test_notify_failure_quotes_shell_metacharacters
  (; touch 与 $(touch ) 不执行)。
- 2099/2103 goal verify:无插值,任务配置验测串,同 run_verify。
- 无新增 High;pip-audit 0 漏洞。

覆盖率(同口径三套件 coverage 计量):75.96% -> 77.87%
(22392 行/缺 5385 -> 22437 行/缺 4963,显示 76% -> 78%)
- client.py 0% -> 90%(pipe 假子进程 + main 分支)
- run_parallel.py 0% -> 97%、migrate 包装 0% -> 95%
- playwright_mcp 37% -> 62%、imagegen_mcp 47% -> 79%、
  websearch_mcp 51% -> 86%、deploy.py 56% -> 77%
- verify-multiuser 0% -> 27%(仅 check/req helper;main()
  是主机侧真实多用户实弹验证,按门禁不建生产任务、
  不以 mock 冒充,仍为缺口)
- host.py 55% -> 57%(文件 2020 -> 2060 行系 E702 分行
  的计量口径变化,非代码膨胀)
- 未到 85%:门槛保持 75% 不动,不删低覆盖模块出统计口径;
  缺口主力仍是 server.py / worker.py / host.py 大文件,
  下一阶段须针对性深测,非本轨快赢可及。

验证:三套件 1576 -> 1629 项全过(tests 127、cloud/tests
1449 skipped=4、deploy/tests 53);ruff E9 通过;mypy 0;
bandit High 4(同上);pip-audit 0 漏洞;试跑产物已删,
提交后工作树干净。
2026-11-03 02:48:54 +00:00

278 lines
9.8 KiB
Python
Raw Permalink Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
"""goal 字段与 PR 事件推送的端点级单测。
- POST /tasks 接受 goal/verify_command/goal_max_rounds,非法值 400。
- init_db 迁移后 tasks 表含 goal 三列。
- POST /tasks/{id}/pr 成功时发 review-requested,落盘失败时发
merge-failed(订阅指向本地回环监听,断言真收到)。
git/gh 一律 fake,不跑真实命令、不联网。
"""
import http.client
import http.server
import json
import os
import sqlite3
import sys
import tempfile
import threading
import unittest
from pathlib import Path
from types import SimpleNamespace
try:
from cloud.auth import AuthStore
from cloud.push import create_subscription
from cloud.server import create_server
except ImportError:
sys.path.insert(0, str(Path(__file__).resolve().parents[2]))
from cloud.auth import AuthStore
from cloud.push import create_subscription
from cloud.server import create_server
def _result(returncode=0, stdout="", stderr=""):
return SimpleNamespace(returncode=returncode, stdout=stdout,
stderr=stderr)
class _Git:
"""假 git:remote/branch/add/commit/push,记录命令。"""
def __init__(self, remote, branch, push_rc=0):
self.calls = []
self.remote = remote
self.branch = branch
self.push_rc = push_rc
def __call__(self, cmd, cwd):
self.calls.append(list(cmd))
if "remote" in cmd:
return _result(0, self.remote + "\n")
if "branch" in cmd:
return _result(0, self.branch + "\n")
if "add" in cmd:
return _result(0, "")
if "commit" in cmd:
return _result(1, "",
"nothing to commit, working tree clean")
if "push" in cmd:
return _result(self.push_rc, "",
"push rejected" if self.push_rc else "")
return _result(0, "")
class _Gh:
"""假 gh:auth 通过、pr create 回链接。"""
def __init__(self, pr_url):
self.calls = []
self.pr_url = pr_url
def __call__(self, cmd, cwd):
self.calls.append(list(cmd))
if cmd[:2] == ["gh", "auth"]:
return _result(0, "", "")
if cmd[:2] == ["gh", "pr"]:
return _result(0, self.pr_url + "\n")
return _result(0, "")
class _Listener:
"""本地回环 webhook 接收器。"""
def __init__(self):
self.requests = []
outer = self
class Handler(http.server.BaseHTTPRequestHandler):
def do_POST(self):
length = int(self.headers.get("Content-Length") or 0)
body = self.rfile.read(length) if length else b""
outer.requests.append(json.loads(body.decode("utf-8")))
self.send_response(200)
self.send_header("Content-Length", "2")
self.end_headers()
self.wfile.write(b"{}")
def log_message(self, *args):
pass
self.server = http.server.ThreadingHTTPServer(
("127.0.0.1", 0), Handler)
self.thread = threading.Thread(
target=self.server.serve_forever, daemon=True)
self.thread.start()
self.url = "http://127.0.0.1:%d/hook" % \
self.server.server_address[1]
def stop(self):
self.server.shutdown()
self.server.server_close()
self.thread.join(timeout=5)
class GoalPrNotifyTestCase(unittest.TestCase):
def setUp(self):
# P1 SSRF 门默认挡 loopback;本地监听器测试显式放行,
# 生产默认值仍关闭。
self._old_push_allow = os.environ.get(
"CODEX_PUSH_ALLOW_PRIVATE_TARGETS")
os.environ["CODEX_PUSH_ALLOW_PRIVATE_TARGETS"] = "1"
self.tmp = tempfile.TemporaryDirectory()
self.db_path = os.path.join(self.tmp.name, "control.db")
self.auth = AuthStore(self.db_path)
self.owner_id, self.owner_key = self.auth.create_user("owner")
self.server = create_server(self.db_path, "127.0.0.1", 0)
self.port = self.server.server_address[1]
self.thread = threading.Thread(
target=self.server.serve_forever, daemon=True)
self.thread.start()
self.worktrees = os.path.join(self.tmp.name, "worktrees")
os.makedirs(self.worktrees, exist_ok=True)
self.server.host_worktrees_dir = self.worktrees
self.listener = _Listener()
def tearDown(self):
self.listener.stop()
self.server.shutdown()
self.server.server_close()
self.thread.join(timeout=5)
if getattr(self, "_old_push_allow", None) is None:
os.environ.pop("CODEX_PUSH_ALLOW_PRIVATE_TARGETS", None)
else:
os.environ["CODEX_PUSH_ALLOW_PRIVATE_TARGETS"] = (
self._old_push_allow)
try:
self.auth.conn.close()
except Exception:
pass
self.tmp.cleanup()
def _req(self, method, path, body=None, key=None):
conn = http.client.HTTPConnection(
"127.0.0.1", self.port, timeout=10)
hdrs = {}
payload = None
if body is not None:
payload = json.dumps(body).encode("utf-8")
hdrs["Content-Type"] = "application/json"
if key is not None:
hdrs["X-API-Key"] = key
try:
conn.request(method, path, body=payload, headers=hdrs)
resp = conn.getresponse()
data = resp.read()
finally:
conn.close()
try:
parsed = json.loads(data.decode("utf-8")) if data else None
except ValueError:
parsed = None
return resp.status, parsed
def _project(self, name="p"):
status, project = self._req(
"POST", "/projects", {"name": name, "auto_pr": 1},
self.owner_key)
self.assertEqual(status, 201, project)
return project["id"]
def _merged_task(self, project_id, task_id):
conn = sqlite3.connect(self.db_path)
try:
conn.execute(
"INSERT INTO tasks(id, project_id, prompt, status,"
" depends_on, priority, created_by, created_at,"
" updated_at, last_heartbeat) VALUES(?, ?, ?, 'merged',"
" '[]', 0, 'system', 0, 0, NULL)",
(task_id, project_id, "do it"))
conn.commit()
finally:
conn.close()
os.makedirs(os.path.join(self.worktrees, task_id), exist_ok=True)
def test_create_task_goal_fields(self):
pid = self._project()
status, task = self._req(
"POST", "/tasks",
{"project_id": pid, "prompt": "do it",
"goal": "make x", "verify_command": "test -f x",
"goal_max_rounds": 2},
self.owner_key)
self.assertEqual(status, 201, task)
self.assertEqual(task["goal"], "make x")
self.assertEqual(task["verify_command"], "test -f x")
self.assertEqual(task["goal_max_rounds"], 2)
# 不带 goal 字段:普通任务,字段为空。
status, task = self._req(
"POST", "/tasks",
{"project_id": pid, "prompt": "plain"},
self.owner_key)
self.assertEqual(status, 201, task)
self.assertIsNone(task["goal"])
self.assertIsNone(task["verify_command"])
# 非法轮次:0 与非数字都 400,且不建任务。
for bad in (0, -1, "x"):
status, body = self._req(
"POST", "/tasks",
{"project_id": pid, "prompt": "bad",
"verify_command": "true", "goal_max_rounds": bad},
self.owner_key)
self.assertEqual(status, 400, body)
def test_migration_adds_goal_columns(self):
conn = sqlite3.connect(self.db_path)
try:
cols = {row[1] for row in conn.execute(
"PRAGMA table_info(tasks)").fetchall()}
finally:
conn.close()
self.assertIn("goal", cols)
self.assertIn("verify_command", cols)
self.assertIn("goal_max_rounds", cols)
def test_pr_success_notifies_review_requested(self):
pid = self._project()
create_subscription(
self.db_path, pid, self.owner_id, "webhook",
self.listener.url, "instant")
self._merged_task(pid, "t-pr-ok")
self.server.pr_git_runner = _Git(
"https://github.com/octo/repo.git", "host/t-pr-ok")
self.server.pr_gh_runner = _Gh(
"https://github.com/octo/repo/pull/9")
status, body = self._req(
"POST", "/tasks/t-pr-ok/pr", {}, self.owner_key)
self.assertEqual(status, 200, body)
self.assertEqual(len(self.listener.requests), 1)
event = self.listener.requests[0]
self.assertEqual(event["event_type"], "review-requested")
self.assertEqual(event["task_id"], "t-pr-ok")
self.assertIn("pull/9", event["payload"]["pr_url"])
def test_pr_failure_notifies_merge_failed(self):
pid = self._project()
create_subscription(
self.db_path, pid, self.owner_id, "webhook",
self.listener.url, "instant")
self._merged_task(pid, "t-pr-fail")
self.server.pr_git_runner = _Git(
"https://github.com/octo/repo.git", "host/t-pr-fail",
push_rc=1)
self.server.pr_gh_runner = _Gh(
"https://github.com/octo/repo/pull/9")
status, body = self._req(
"POST", "/tasks/t-pr-fail/pr", {}, self.owner_key)
self.assertEqual(status, 502, body)
self.assertEqual(body["step"], "push")
self.assertEqual(len(self.listener.requests), 1)
event = self.listener.requests[0]
self.assertEqual(event["event_type"], "merge-failed")
self.assertEqual(event["task_id"], "t-pr-fail")
self.assertEqual(event["payload"]["step"], "push")
if __name__ == "__main__":
unittest.main()