Files
codex-app-server/cloud/tests/test_server_merge.py
T
host 07a8eaaa73 Docker sandbox real test + cloud merge status endpoint
- DockerExecutor: extra mounts (host.py work/state, repo, codex-home
  at same paths), worker --docker-extra-mounts, container user
  configurable; Dockerfile copies codex-resources beside the codex
  binary and puts bwrap on PATH (previous /usr/local/lib layout
  made codex report bubblewrap unavailable inside the container).
- Real Docker task on external host: triple added in ~18s, merged
  inside a container, main repo now add+mul2+triple, --rm cleanup.
  Honest boundary: this host/kernel forbids unprivileged user
  namespaces, so bwrap fails on host and in containers; production
  mode here is Docker isolation + inner danger-full-access, not
  double sandboxing.
- Cloud merge status: POST /tasks/{id}/merge syncs status only
  (merge itself stays with host.py merge); completed -> merged,
  maintainer+ (approve_merge), other states and repeat calls 409,
  audit merge_task. Tests: cloud 223, host 27, all passing.
2026-10-26 02:46:10 +08:00

149 lines
5.4 KiB
Python

"""云端合并状态端点测试:POST /tasks/{id}/merge。
只测状态同步本身,不执行真实合并:合并仍由 host.py merge
(本地或 Docker 容器内)执行,成功后再调本接口把云端
任务从 completed 改为 merged。规则:404/401/403/409
语义、maintainer 以上才能合并、审计里有 merge_task。
"""
import http.client
import json
import os
import sqlite3
import sys
import tempfile
import threading
import unittest
from pathlib import Path
try:
from cloud.auth import AuthStore
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.server import create_server
class MergeTestCase(unittest.TestCase):
def setUp(self):
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.maint_id, self.maint_key = self.auth.create_user("maint")
self.contrib_id, self.contrib_key = self.auth.create_user("contrib")
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()
status, self.project = self._req(
"POST", "/projects", {"name": "demo"}, self.owner_key)
self.assertEqual(status, 201)
self.auth.set_member(
self.project["id"], self.owner_id, self.maint_id, "maintainer")
self.auth.set_member(
self.project["id"], self.owner_id, self.contrib_id, "contributor")
def tearDown(self):
self.server.shutdown()
self.server.server_close()
self.thread.join(timeout=5)
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 _completed_task(self):
status, task = self._req(
"POST", "/tasks",
{"project_id": self.project["id"], "prompt": "x"},
self.owner_key)
self.assertEqual(status, 201)
conn = sqlite3.connect(self.db_path)
try:
conn.execute(
"UPDATE tasks SET status = 'completed' WHERE id = ?",
(task["id"],))
conn.commit()
finally:
conn.close()
return task
def test_merge_completed_by_owner(self):
task = self._completed_task()
status, merged = self._req(
"POST", "/tasks/%s/merge" % task["id"], {}, self.owner_key)
self.assertEqual(status, 200)
self.assertEqual(merged["status"], "merged")
status, got = self._req(
"GET", "/tasks/%s" % task["id"], key=self.owner_key)
self.assertEqual(merged["status"], got["status"])
audit = self.auth.list_audit(self.project["id"])
self.assertTrue(any(a["action"] == "merge_task" for a in audit))
def test_merge_by_maintainer_ok_contributor_forbidden(self):
task = self._completed_task()
status, body = self._req(
"POST", "/tasks/%s/merge" % task["id"], {}, self.contrib_key)
self.assertEqual(status, 403)
status, merged = self._req(
"POST", "/tasks/%s/merge" % task["id"], {}, self.maint_key)
self.assertEqual(status, 200)
self.assertEqual(merged["status"], "merged")
def test_merge_non_completed_409_and_repeat_409(self):
status, task = self._req(
"POST", "/tasks",
{"project_id": self.project["id"], "prompt": "x"},
self.owner_key)
self.assertEqual(status, 201)
status, body = self._req(
"POST", "/tasks/%s/merge" % task["id"], {}, self.owner_key)
self.assertEqual(status, 409)
self.assertEqual(body["status"], "queued")
done = self._completed_task()
status, _ = self._req(
"POST", "/tasks/%s/merge" % done["id"], {}, self.owner_key)
self.assertEqual(status, 200)
status, body = self._req(
"POST", "/tasks/%s/merge" % done["id"], {}, self.owner_key)
self.assertEqual(status, 409)
self.assertEqual(body["status"], "merged")
def test_merge_missing_and_no_key(self):
status, _ = self._req(
"POST", "/tasks/nope/merge", {}, self.owner_key)
self.assertEqual(status, 404)
task = self._completed_task()
status, _ = self._req("POST", "/tasks/%s/merge" % task["id"], {})
self.assertEqual(status, 401)
if __name__ == "__main__":
unittest.main()