feat(asset): add photos, monitor links and deletion
Apply asset_db_002_photos_monitors.sql before rebuilding web. Restrict soft deletion to the super admin; retain reports and audit.
This commit is contained in:
@@ -42,6 +42,32 @@ const users = [
|
||||
{ email: "reader@test.local", name: "담당자" },
|
||||
{ email: "staff@test.local", name: "직원" },
|
||||
];
|
||||
Object.assign(records[2], {
|
||||
name: "Registered Monitor",
|
||||
category: "monitor",
|
||||
model: "Test Display 24",
|
||||
serial: "synthetic-monitor-1",
|
||||
});
|
||||
const photoRecords = new Map(),
|
||||
monitorLinks = new Map();
|
||||
const photoPNG = Buffer.from(
|
||||
"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+jR1kAAAAASUVORK5CYII=",
|
||||
"base64",
|
||||
);
|
||||
function monitorItems(a) {
|
||||
return [0, 1, 2].map((i) => ({
|
||||
index: i,
|
||||
name: "Test Display " + (i + 1),
|
||||
model: "Test Display 24",
|
||||
serial: i < 2 ? "synthetic-monitor-" + (i + 1) : "",
|
||||
manufacturer: "Test",
|
||||
asset:
|
||||
records.find((r) => r.id === monitorLinks.get(a.id + ":" + i)) ||
|
||||
(i === 0 ? records.find((r) => r.id === "asset2") : null),
|
||||
candidates:
|
||||
i === 2 ? [records.find((r) => r.id === "asset2")].filter(Boolean) : [],
|
||||
}));
|
||||
}
|
||||
const events = [
|
||||
{
|
||||
id: 1,
|
||||
@@ -94,9 +120,11 @@ const server = http.createServer(async (req, res) => {
|
||||
fs.readFileSync(
|
||||
path.join(
|
||||
OUT,
|
||||
url.searchParams.has("unconfigured")
|
||||
? "asset_unconfigured.html"
|
||||
: "asset_render.html",
|
||||
url.searchParams.has("super")
|
||||
? "asset_super.html"
|
||||
: url.searchParams.has("unconfigured")
|
||||
? "asset_unconfigured.html"
|
||||
: "asset_render.html",
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -243,9 +271,56 @@ const server = http.createServer(async (req, res) => {
|
||||
report: a.latest_report_id ? { ...reports[0], parsed } : null,
|
||||
reports: a.latest_report_id ? reports : [],
|
||||
events: events.filter((e) => e.asset_id === a.id),
|
||||
photos: photoRecords.get(a.id) || [],
|
||||
monitors: a.latest_report_id ? monitorItems(a) : [],
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (parts.length === 2 && req.method === "DELETE") {
|
||||
assert.equal(body.version, a.version);
|
||||
records.splice(records.indexOf(a), 1);
|
||||
json(res, { ok: true });
|
||||
return;
|
||||
}
|
||||
if (parts[2] === "photos" && parts.length === 3 && req.method === "POST") {
|
||||
const match = raw.toString().match(/name="version"\r\n\r\n(\d+)/);
|
||||
assert.equal(Number(match[1]), a.version);
|
||||
const photos = photoRecords.get(a.id) || [];
|
||||
photos.push({ id: "photo" + photos.length, filename: "test.png" });
|
||||
photoRecords.set(a.id, photos);
|
||||
a.version++;
|
||||
json(res, { id: photos.at(-1).id });
|
||||
return;
|
||||
}
|
||||
if (parts[2] === "photos" && parts.length === 4) {
|
||||
res.setHeader("Content-Type", "image/png");
|
||||
res.end(photoPNG);
|
||||
return;
|
||||
}
|
||||
if (parts[2] === "monitors" && req.method === "POST") {
|
||||
assert.equal(body.version, a.version);
|
||||
let target;
|
||||
if (body.asset) {
|
||||
target = {
|
||||
...records[1],
|
||||
...body.asset,
|
||||
id: "asset" + counter++,
|
||||
tag: "AST-MONITOR",
|
||||
version: 1,
|
||||
latest_report_id: null,
|
||||
specs: null,
|
||||
};
|
||||
records.push(target);
|
||||
} else target = records.find((r) => r.id === body.asset_id);
|
||||
monitorLinks.set(a.id + ":" + parts[3], target.id);
|
||||
a.version++;
|
||||
json(res, { id: target.id });
|
||||
return;
|
||||
}
|
||||
if (parts[2] === "reports" && parts[4] === "monitors") {
|
||||
json(res, { items: monitorItems(a) });
|
||||
return;
|
||||
}
|
||||
if (parts.length === 2 && req.method === "PUT") {
|
||||
if (conflict) {
|
||||
conflict = false;
|
||||
@@ -352,6 +427,19 @@ const server = http.createServer(async (req, res) => {
|
||||
);
|
||||
await page.locator('[data-open="asset0"][data-tab="specs"]').click();
|
||||
await page.locator("#am-spec-query").waitFor();
|
||||
assert.equal(
|
||||
await page.locator("[data-delete]").count(),
|
||||
0,
|
||||
"ordinary users must not see deletion",
|
||||
);
|
||||
assert.equal(await page.locator(".am-monitor-card").count(), 3);
|
||||
await page.locator('[data-monitor-open="asset2"]').click();
|
||||
await page
|
||||
.locator("#am-detail-title")
|
||||
.filter({ hasText: "Registered Monitor" })
|
||||
.waitFor();
|
||||
await page.locator("[data-return-computer]").click();
|
||||
await page.locator("#am-spec-query").waitFor();
|
||||
assert.ok(
|
||||
(await page.locator(".am-spec-card").first().textContent()).includes(
|
||||
parsed.summary.cpu,
|
||||
@@ -474,6 +562,50 @@ const server = http.createServer(async (req, res) => {
|
||||
.waitFor();
|
||||
assert.equal(await page.locator('[data-detail-tab="specs"]').count(), 0);
|
||||
await page.keyboard.press("Escape");
|
||||
// 모니터 등록과 연결이 끝나면 같은 화면에서 자산 개요를 확인할 수 있습니다.
|
||||
await page.goto(origin + "/asset/?asset=asset0&tab=specs");
|
||||
await page.locator('[data-monitor-create="1"]').waitFor();
|
||||
await page.locator('[data-monitor-create="1"]').click();
|
||||
assert.equal(
|
||||
await page.locator('#am-editor-form [name="category"]').inputValue(),
|
||||
"monitor",
|
||||
);
|
||||
assert.equal(
|
||||
await page.locator('#am-editor-form [name="category"]').isDisabled(),
|
||||
true,
|
||||
);
|
||||
await page.locator('#am-editor-form [name="name"]').fill("New Monitor");
|
||||
await page.locator('#am-editor-form [type="submit"]').click();
|
||||
await page.waitForFunction(
|
||||
() => !document.querySelector("#am-editor").open,
|
||||
);
|
||||
await page
|
||||
.locator(".am-linked-overview h4")
|
||||
.filter({ hasText: "New Monitor" })
|
||||
.waitFor();
|
||||
assert.equal(await page.locator('[data-monitor-create="1"]').count(), 0);
|
||||
await page.locator('[data-monitor-link="2"]').click();
|
||||
await page.waitForFunction(
|
||||
() => document.querySelectorAll(".am-linked-overview").length === 3,
|
||||
);
|
||||
await page.screenshot({ path: path.join(OUT, "asset-monitor-links.png") });
|
||||
await page.locator('[data-detail-tab="overview"]').click();
|
||||
await page.locator("[data-photo]").click();
|
||||
await page
|
||||
.locator("#am-photo-file")
|
||||
.setInputFiles({
|
||||
name: "test.png",
|
||||
mimeType: "image/png",
|
||||
buffer: photoPNG,
|
||||
});
|
||||
await page.locator('#am-photo-form [type="submit"]').click();
|
||||
await page.waitForFunction(() => !document.querySelector("#am-photo").open);
|
||||
await page.locator('.am-photo-grid img[alt="test.png"]').waitFor();
|
||||
await page.waitForFunction(
|
||||
() => document.querySelector(".am-photo-grid img")?.naturalWidth > 0,
|
||||
);
|
||||
await page.screenshot({ path: path.join(OUT, "asset-photos.png") });
|
||||
await page.keyboard.press("Escape");
|
||||
await page.setViewportSize({ width: 390, height: 844 });
|
||||
await page.locator("#am-reset").click();
|
||||
await page.waitForTimeout(100);
|
||||
@@ -517,9 +649,35 @@ const server = http.createServer(async (req, res) => {
|
||||
.setInputFiles(path.join(OUT, "asset_upload.xml"));
|
||||
await page.locator("#am-report-preview").waitFor({ state: "visible" });
|
||||
assert.equal(await page.locator("#am-import-save").isDisabled(), true);
|
||||
// 수퍼 관리자는 자산번호·사유 확인 후 삭제하고, 취소와 잘못된 입력은 요청하지 않습니다.
|
||||
await page.goto(origin + "/asset/?super=1&asset=asset5");
|
||||
await page.locator("[data-delete]").waitFor();
|
||||
await page.locator("[data-delete]").click();
|
||||
await page.locator("#am-delete-confirm").fill("WRONG");
|
||||
await page.locator("#am-delete-note").fill("Duplicate test asset");
|
||||
await page.locator('#am-delete-form [type="submit"]').click();
|
||||
await page
|
||||
.locator("#am-delete-form .am-form-error")
|
||||
.filter({ hasText: "자산번호" })
|
||||
.waitFor();
|
||||
const before = records.length;
|
||||
await page.locator("#am-delete-confirm").fill("AST-000006");
|
||||
await page.locator('#am-delete-form [type="submit"]').click();
|
||||
await page.waitForFunction(
|
||||
() => !document.querySelector("#am-detail").open,
|
||||
);
|
||||
assert.equal(records.length, before - 1);
|
||||
assert.equal(
|
||||
records.some((a) => a.id === "asset5"),
|
||||
false,
|
||||
);
|
||||
await page.waitForFunction(
|
||||
(n) => document.querySelector("#am-total").textContent === String(n),
|
||||
records.length,
|
||||
);
|
||||
assert.deepEqual(errors, []);
|
||||
console.log(
|
||||
"ALL PASS: Chrome desktop/mobile, search races, paging, specs, XSS escaping, conflict draft, create, checkout/checkin, report preview, setup mode",
|
||||
"ALL PASS: Chrome desktop/mobile, search races, paging, specs, XSS escaping, conflict draft, create, checkout/checkin, reports, setup mode, photos, monitor registration/link/overview, super-admin deletion",
|
||||
);
|
||||
} finally {
|
||||
await browser?.close();
|
||||
|
||||
@@ -21,8 +21,11 @@ for configured in (True, False):
|
||||
html = env.get_template("asset/index.html").render(
|
||||
user={"email": "reader@test.local", "name": "Reader"}, nav_items=[], is_admin=False,
|
||||
page_title="자산관리", page_subtitle="회사 자산을 한곳에서", categories=CATEGORIES, statuses=STATUSES,
|
||||
csrf_token="browser-test", configured=configured)
|
||||
csrf_token="browser-test", configured=configured, can_delete=False)
|
||||
(out / ("asset_render.html" if configured else "asset_unconfigured.html")).write_text(html, encoding="utf-8")
|
||||
(out / "asset_super.html").write_text(env.get_template("asset/index.html").render(
|
||||
user={"email":"super@test.local","name":"Super"},nav_items=[],is_admin=True,
|
||||
categories=CATEGORIES,statuses=STATUSES,csrf_token="browser-test",configured=True,can_delete=True),encoding="utf-8")
|
||||
sample = ROOT / "KING-DESKTOP.XML"
|
||||
raw = sample.read_bytes() if sample.exists() else report_xml()
|
||||
(out / "asset_report.json").write_text(json.dumps(parse_hwinfo(raw), ensure_ascii=False), encoding="utf-8")
|
||||
|
||||
+40
-1
@@ -247,6 +247,45 @@ class TransactionTests(unittest.TestCase):
|
||||
|
||||
|
||||
class APITests(unittest.TestCase):
|
||||
def test_delete_requires_true_super_admin_csrf_reason_and_version(self):
|
||||
calls=[]
|
||||
self.app.state.asset_store=SimpleNamespace(delete=lambda *args: calls.append(args))
|
||||
payload={"version":1,"note":"Duplicate entry"}
|
||||
for user in ({"email":"admin@test.local","role":"admin","is_super_admin":True},self.user):
|
||||
self.user=user
|
||||
self.assertEqual(self.client.request("DELETE","/asset/api/assets/a",json=payload,headers=self.headers).status_code,403)
|
||||
from app.store import SUPER_ADMIN_EMAIL
|
||||
self.user={"email":SUPER_ADMIN_EMAIL,"role":"admin","is_super_admin":True}
|
||||
self.assertEqual(self.client.request("DELETE","/asset/api/assets/a",json=payload).status_code,403)
|
||||
self.assertEqual(self.client.request("DELETE","/asset/api/assets/a",json={"version":1,"note":" "},headers=self.headers).status_code,422)
|
||||
self.assertEqual(self.client.request("DELETE","/asset/api/assets/a",json=payload,headers=self.headers).status_code,200)
|
||||
self.assertEqual(calls,[("a",1,SUPER_ADMIN_EMAIL,"Duplicate entry")])
|
||||
|
||||
def test_photos_validated_authorized_and_bound_to_asset(self):
|
||||
from PIL import Image
|
||||
image=io.BytesIO();Image.new("RGB",(10,20),"blue").save(image,"PNG")
|
||||
calls=[]
|
||||
self.app.state.asset_store=SimpleNamespace(add_photo=lambda *args: calls.append(args) or "p",photo=lambda *args: {"image":image.getvalue(),"mime":"image/png"})
|
||||
path="/asset/api/assets/a/photos"
|
||||
self.assertEqual(self.client.post(path,files={"file":("fake.jpg",b"<svg/>")},data={"version":1},headers=self.headers).status_code,422)
|
||||
self.assertEqual(self.client.post(path,files={"file":("photo.png",image.getvalue())},data={"version":1}).status_code,403)
|
||||
result=self.client.post(path,files={"file":("photo.png",image.getvalue())},data={"version":1},headers=self.headers)
|
||||
self.assertEqual(result.status_code,200);self.assertEqual(calls[0][:4],("a",1,self.user["email"],"photo.png"))
|
||||
self.assertEqual(self.client.get(path+"/p").headers["content-type"],"image/png")
|
||||
self.user=None
|
||||
self.assertEqual(self.client.get(path+"/p").status_code,401)
|
||||
|
||||
def test_monitor_registration_permission_payload_and_version(self):
|
||||
calls=[]
|
||||
self.app.state.asset_store=SimpleNamespace(register_monitor=lambda *args:calls.append(args) or "monitor")
|
||||
path="/asset/api/assets/pc/monitors/0"
|
||||
data={"version":3,"report_id":"r","asset":{"name":"Display","category":"monitor"}}
|
||||
self.assertEqual(self.client.post(path,json=data).status_code,403)
|
||||
self.assertEqual(self.client.post(path,json=data,headers=self.headers).status_code,200)
|
||||
self.assertEqual((calls[0][0],calls[0][1],calls[0][2].version),("pc",0,3))
|
||||
data["asset"]["category"]="desk"
|
||||
self.assertEqual(self.client.post(path,json=data,headers=self.headers).status_code,422)
|
||||
|
||||
def setUp(self):
|
||||
self.user = {"email": "reader@test.local", "name": "Reader", "role": "user", "modules": {"asset": True}}
|
||||
self.user_store = SimpleNamespace(get=lambda email: self.user if email == self.user["email"] else None, list_all=lambda: [self.user])
|
||||
@@ -262,7 +301,7 @@ class APITests(unittest.TestCase):
|
||||
self.client.get("/test-session"); self.headers = {"X-Asset-CSRF": "test-token"}
|
||||
|
||||
def test_login_and_permission_required_every_read(self):
|
||||
paths = ["/asset/health", "/asset/api/bootstrap", "/asset/api/assets", "/asset/api/assets/a", "/asset/api/export", "/asset/api/assets/a/reports/r", "/asset/api/assets/a/reports/r/download"]
|
||||
paths = ["/asset/health", "/asset/api/bootstrap", "/asset/api/assets", "/asset/api/assets/a", "/asset/api/export", "/asset/api/assets/a/reports/r", "/asset/api/assets/a/reports/r/download", "/asset/api/assets/a/photos/p", "/asset/api/assets/a/reports/r/monitors"]
|
||||
self.user = None
|
||||
for path in paths: self.assertEqual(self.client.get(path).status_code, 401)
|
||||
self.user = {"role": "user", "email": "x", "modules": {}}
|
||||
|
||||
@@ -0,0 +1,168 @@
|
||||
"""삭제 권한, 사진 검증, 모니터 중복과 동시 수정 보호를 확인합니다."""
|
||||
import copy
|
||||
import io
|
||||
import unittest
|
||||
from contextlib import contextmanager
|
||||
from types import SimpleNamespace
|
||||
|
||||
from PIL import Image
|
||||
|
||||
import test_asset as fixtures
|
||||
from app.modules.asset.db import AssetStore
|
||||
from app.modules.asset.media import MAX_PHOTO_BYTES, prepare_photo
|
||||
from app.modules.asset.monitors import monitor_devices
|
||||
from app.modules.asset.store import AssetConflict, AssetInput, DeleteInput, MonitorInput
|
||||
from asset_fixtures import report_xml
|
||||
from app.modules.asset.hwinfo import parse_hwinfo
|
||||
|
||||
|
||||
def monitor_report(serial="SN-1"):
|
||||
parsed = parse_hwinfo(report_xml())
|
||||
parsed["devices"]["MONITOR"] = [{"name": "Test Display", "properties": [
|
||||
{"label": "Monitor Name (Manuf)", "value": "Display 24", "type": "MONITOR"},
|
||||
{"label": "Serial Number", "value": serial, "type": ""}]}]
|
||||
return parsed
|
||||
|
||||
|
||||
class Result:
|
||||
def __init__(self, rows): self.rows = rows
|
||||
def fetchone(self): return self.rows[0] if self.rows else None
|
||||
def fetchall(self): return self.rows
|
||||
|
||||
|
||||
class FeatureConnection(fixtures.Connection):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self.photos, self.links = {}, {}
|
||||
|
||||
@contextmanager
|
||||
def transaction(self):
|
||||
before = copy.deepcopy((self.photos, self.links))
|
||||
try:
|
||||
with super().transaction(): yield self
|
||||
except Exception:
|
||||
self.photos, self.links = before
|
||||
raise
|
||||
|
||||
def execute(self, sql, params=()):
|
||||
if sql.startswith("SELECT a.* FROM asset_monitor_links"):
|
||||
target = self.links.get(tuple(params))
|
||||
row = self.assets.get(target)
|
||||
return Result([row] if row and not row.get("deleted_at") else [])
|
||||
if sql.startswith("SELECT * FROM assets") and "FOR UPDATE" not in sql:
|
||||
rows = [a for a in self.assets.values() if a["category"] == "monitor" and not a.get("deleted_at")]
|
||||
if "btrim(serial)" in sql: rows = [a for a in rows if a["serial"].strip().casefold() == params[0]]
|
||||
else: rows = [a for a in rows if a["model"].strip().casefold() == params[0] or a["name"].strip().casefold() == params[1]]
|
||||
return Result(rows)
|
||||
if sql.startswith("SELECT parsed FROM asset_reports"):
|
||||
row=self.reports.get(params[1])
|
||||
return Result([{"parsed": row["parsed"].obj}] if row and row["asset_id"] == params[0] else [])
|
||||
if sql.startswith("SELECT pg_advisory"):
|
||||
self.assert_tx(); return Result([])
|
||||
if sql.startswith("SELECT count(*) AS n FROM asset_photos"):
|
||||
return Result([{"n":sum(p["asset_id"] == params[0] for p in self.photos.values())}])
|
||||
if sql.startswith("INSERT INTO asset_photos"):
|
||||
self.photos[params[0]] = dict(zip(("id","asset_id","filename","image","mime","width","height","actor"),params))
|
||||
return Result([])
|
||||
if sql.startswith("INSERT INTO asset_monitor_links"):
|
||||
self.links[tuple(params[:2])] = params[2]; return Result([])
|
||||
if sql.startswith("UPDATE assets SET version="):
|
||||
self.assets[params[0]]["version"] += 1; return Result([])
|
||||
if sql.startswith("UPDATE assets SET deleted_at="):
|
||||
self.assets[params[1]].update(deleted_at="deleted",deleted_by=params[0])
|
||||
self.assets[params[1]]["version"] += 1; return Result([])
|
||||
return super().execute(sql,params)
|
||||
|
||||
|
||||
class FeatureStoreTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.conn=FeatureConnection(); self.store=object.__new__(AssetStore);self.store._pool=fixtures.Pool(self.conn)
|
||||
self.computer=self.store.create(AssetInput(name="PC",category="computer"),"actor")
|
||||
self.parsed=monitor_report()
|
||||
self.report=self.store.attach_report(self.computer,1,"actor","report.xml",report_xml(),self.parsed)
|
||||
|
||||
def monitor_payload(self, **kwargs):
|
||||
return MonitorInput(version=self.conn.assets[self.computer]["version"],report_id=self.report,**kwargs)
|
||||
|
||||
def test_registration_connects_and_prevents_duplicates(self):
|
||||
target=self.store.register_monitor(self.computer,0,self.monitor_payload(asset=AssetInput(name="Monitor",category="monitor",model="Display 24")),"actor")
|
||||
self.assertEqual(self.conn.assets[target]["serial"],"SN-1")
|
||||
match=self.store._monitor_matches(self.conn,self.computer,self.parsed)[0]
|
||||
self.assertEqual((match["asset"]["id"],match["match"]),(target,"linked"))
|
||||
with self.assertRaises(AssetConflict):
|
||||
self.store.register_monitor(self.computer,0,self.monitor_payload(asset=AssetInput(name="Duplicate",category="monitor")),"actor")
|
||||
self.assertEqual(len(self.conn.assets),2)
|
||||
|
||||
def test_ambiguous_serial_and_model_require_selection(self):
|
||||
for i in range(2): self.store.create(AssetInput(name="Display",category="monitor",model="Display 24",serial="SN-1"),"actor")
|
||||
match=self.store._monitor_matches(self.conn,self.computer,self.parsed)[0]
|
||||
self.assertIsNone(match["asset"]);self.assertEqual(len(match["candidates"]),2)
|
||||
target=match["candidates"][1]["id"]
|
||||
self.store.register_monitor(self.computer,0,self.monitor_payload(asset_id=target),"actor")
|
||||
self.assertEqual(self.store._monitor_matches(self.conn,self.computer,self.parsed)[0]["asset"]["id"],target)
|
||||
unknown=monitor_report("0")
|
||||
match=self.store._monitor_matches(self.conn,"other-computer",unknown)[0]
|
||||
self.assertIsNone(match["asset"]);self.assertEqual(len(match["candidates"]),2)
|
||||
|
||||
def test_existing_unique_serial_matches_automatically(self):
|
||||
target=self.store.create(AssetInput(name="Existing",category="monitor",serial="sn-1"),"actor")
|
||||
match=self.store._monitor_matches(self.conn,self.computer,self.parsed)[0]
|
||||
self.assertEqual((match["asset"]["id"],match["match"]),(target,"serial"))
|
||||
|
||||
def test_different_model_same_serial_is_not_auto_linked(self):
|
||||
self.store.create(AssetInput(name="Other",category="monitor",serial="SN-1",model="Different Model",manufacturer="Another"),"actor")
|
||||
match=self.store._monitor_matches(self.conn,self.computer,self.parsed)[0]
|
||||
self.assertIsNone(match["asset"]);self.assertEqual(len(match["candidates"]),1)
|
||||
|
||||
def test_stale_report_and_non_monitor_link_do_not_write(self):
|
||||
before=copy.deepcopy(self.conn.assets)
|
||||
for payload in (MonitorInput(version=2,report_id="old",asset_id=self.computer),MonitorInput(version=1,report_id=self.report,asset_id=self.computer)):
|
||||
with self.assertRaises(AssetConflict): self.store.register_monitor(self.computer,0,payload,"actor")
|
||||
with self.assertRaises(ValueError): self.store.register_monitor(self.computer,0,self.monitor_payload(asset_id=self.computer),"actor")
|
||||
self.assertEqual(before,self.conn.assets);self.assertFalse(self.conn.links)
|
||||
|
||||
def test_link_and_creation_roll_back_if_audit_fails(self):
|
||||
self.conn.fail_event=True
|
||||
with self.assertRaises(RuntimeError):
|
||||
self.store.register_monitor(self.computer,0,self.monitor_payload(asset=AssetInput(name="New",category="monitor")),"actor")
|
||||
self.assertEqual(len(self.conn.assets),1);self.assertFalse(self.conn.links)
|
||||
|
||||
def test_photo_limit_version_and_transaction(self):
|
||||
for i in range(10):
|
||||
self.store.add_photo(self.computer,2+i,"actor","photo.jpg",b"image","image/jpeg",10,10)
|
||||
with self.assertRaises(ValueError): self.store.add_photo(self.computer,12,"actor","photo.jpg",b"image","image/jpeg",10,10)
|
||||
with self.assertRaises(AssetConflict): self.store.add_photo(self.computer,2,"actor","photo.jpg",b"image","image/jpeg",10,10)
|
||||
self.assertEqual(len(self.conn.photos),10)
|
||||
self.conn.photos.clear(); self.conn.fail_event=True
|
||||
with self.assertRaises(RuntimeError): self.store.add_photo(self.computer,12,"actor","photo.jpg",b"image","image/jpeg",10,10)
|
||||
self.assertFalse(self.conn.photos);self.assertEqual(self.conn.assets[self.computer]["version"],12)
|
||||
|
||||
def test_deletion_preserves_reports_and_blocks_later_writes(self):
|
||||
self.store.delete(self.computer,2,"super","Wrong entry")
|
||||
self.assertEqual(len(self.conn.reports),1)
|
||||
self.assertEqual(self.conn.events[-1][2],"delete")
|
||||
with self.assertRaises(KeyError): self.store.delete(self.computer,3,"super","Again")
|
||||
with self.assertRaises(KeyError): self.store.attach_report(self.computer,3,"actor","x.xml",report_xml(),self.parsed)
|
||||
|
||||
|
||||
class MediaTests(unittest.TestCase):
|
||||
def test_images_reencoded_without_exif_and_resized(self):
|
||||
original=Image.new("RGB",(3000,1000),"red");data=io.BytesIO()
|
||||
exif=Image.Exif();exif[271]="Private camera"
|
||||
original.save(data,"JPEG",exif=exif)
|
||||
raw,mime,width,height=prepare_photo(data.getvalue())
|
||||
self.assertEqual((mime,width,height),("image/jpeg",2400,800))
|
||||
with Image.open(io.BytesIO(raw)) as result: self.assertFalse(result.getexif())
|
||||
transparent=io.BytesIO();Image.new("RGBA",(10,10),(0,0,0,0)).save(transparent,"PNG")
|
||||
self.assertEqual(prepare_photo(transparent.getvalue())[1],"image/png")
|
||||
|
||||
def test_fake_svg_oversized_and_large_dimensions_rejected(self):
|
||||
for raw in (b"",b"not a photo",b"<svg/>",b"x"*(MAX_PHOTO_BYTES+1)):
|
||||
with self.assertRaises(ValueError): prepare_photo(raw)
|
||||
raw=io.BytesIO();Image.new("RGB",(5000,5000)).save(raw,"PNG")
|
||||
with self.assertRaises(ValueError): prepare_photo(raw.getvalue())
|
||||
|
||||
def test_unknown_serial_does_not_identify_same_model(self):
|
||||
self.assertEqual(monitor_devices(monitor_report("00000"))[0]["serial"],"")
|
||||
one=monitor_report();two=monitor_report("SN-2")
|
||||
self.assertNotEqual(monitor_devices(one)[0]["key"],monitor_devices(two)[0]["key"])
|
||||
Reference in New Issue
Block a user