5976ef89b4
A suite is the root object: every script belongs to exactly one suite, the
suite holds the ordered member list by reference - the optional setup first,
the members, the optional teardown last - and runs them in one card session,
without resets and without resume.
- test_suites.py: the suite store (test_suites.json, --test-suites), validated
and atomic like the script store: roles normalised (setup first, teardown
last, at most one of each, a script appears once per suite), per-member
on_fail stop/continue and the suite-level require_adm.
- test_scripts.py schema v2: suite_id/require_adm; list_by_suite()/orphans();
the import reports the id_map a bundle import remaps with. v3.21.0 scripts
without a suite are attached once to an auto-created "Imported scripts"
suite (migrate_scripts_to_suites, called from __main__).
- API: /api/test/suites (+ update|delete|import - delete refused while
non-empty; the bundle import imports the scripts first, remaps the suite
references and skips unresolvable ones); the scripts endpoints gain
suite_id/require_adm plus move|copy (delete detaches from the suite first;
a suite update refuses a membership change).
- runner: /api/test/run {suite_id} resolves the members and the preset, runs
the ADM gate, then setup -> members (per-member on_fail) -> teardown. The
teardown always runs on a stop or a failure (skipped only when the card is
gone; it clears the stop flag for its duration); a card reset stops the
suite, skips the remaining members and is flagged. Members' live steps land
in the shared snapshot, their records (status/steps/note/log excerpt/
counters) in _TEST_RUN['suite']; the summary carries the counts, wall time,
preset, the SCP80 counters before/after per keyset and the session flags.
_test_log buffers the semantic lines (bounded) for the report's per-member
excerpts.
- ADM gate (_ensure_adm): a suite/script require_adm verifies the matched
preset's key once per card session (the /api/verify-adm badge sets the same
latch); a failure refuses the start, stamps the session (no automatic
retry) and needs a manual verify.
- PWA: the Test script pill becomes four views - the suite list (default),
the suite editor (the script list: role badges, on_fail, up/down, per-script
Run/Edit/Move/Copy/Delete, Add script with the templates), the script editor
(the step list; a single run shows its result under the steps and is not
preserved) and the suite report (per-member blocks with the step table,
notes and run log; summary; export JSON/Markdown). Suite bundles export/
import; the legacy script export imports into "Imported scripts". EN/RU.
- tests: the suite store/migration, the runner orchestration (order, on_fail,
setup failure, stop, card reset, teardown, per-member logs) and the ADM gate
(Python); the suite HTTP paths; the PWA report/Markdown/wiring (Node).
Tests: 833 frontend + 794 Python; sw cache simple-v397.
355 lines
15 KiB
Python
355 lines
15 KiB
Python
"""Server-side test script store: the card test scripts the runner executes.
|
|
|
|
Test scripts used to live in the browser's localStorage, although the runner
|
|
that executes them is server-side - the store makes the bench state one unit
|
|
(next to the card presets), lets every browser (or a plain API client) manage
|
|
the same set, and validates a script before it is saved, so what is stored is
|
|
what the runner accepts. A load keeps an entry that no longer validates - a
|
|
tightened rule (or a hand edit) must never destroy a stored script; it is
|
|
served, fails at run start with the validator's message, and can be fixed in
|
|
the editor, while the next save rewrites the file with it intact.
|
|
|
|
A stored script is the script JSON (``name`` + ``steps``, the same shape the
|
|
PWA exports) plus a stable uuid and timestamps::
|
|
|
|
{"version": 2, "scripts": [
|
|
{"id": "...", "name": "applet RFM update", "suite_id": "...",
|
|
"require_adm": false, "steps": [...],
|
|
"created": 1690000000.0, "updated": 1690000000.0}]}
|
|
|
|
Schema v2 (v3.22.0) adds ``suite_id``/``require_adm``: a script belongs to
|
|
exactly one test suite (the suite is the root object; the PWA creates scripts
|
|
only inside a suite) and can declare that it needs the ADM PIN verified. A
|
|
v1 entry loads with ``suite_id: None`` - the server attaches such orphans to
|
|
an auto-created "Imported scripts" suite on startup - and the next save
|
|
writes v2. The cross-store rules (the suite exists, a move updates both
|
|
stores, a referenced script cannot leave a dangling reference) live in the
|
|
HTTP layer, which holds both stores.
|
|
|
|
Validation runs on every mutation: the basic shape always, and - when the
|
|
server passes its ``validator`` - the full ``testscript.normalise_script``
|
|
pass (the same one the runner uses at start). Import accepts the old
|
|
localStorage shape (an array of ``{name, steps}``); there is no automatic
|
|
migration - export/import is the path.
|
|
|
|
Layout (``--test-scripts`` overrides the file; ``Path.home()`` resolves the
|
|
same way on Linux, macOS and Windows)::
|
|
|
|
~/.pysim-simple-server/test_scripts.json
|
|
|
|
Writes are atomic (temp file + fsync + ``os.replace``) and every mutation
|
|
holds an ``RLock``. Scripts carry a stable uuid - never array indices.
|
|
"""
|
|
|
|
import copy
|
|
import json
|
|
import os
|
|
import re
|
|
import sys
|
|
import tempfile
|
|
import threading
|
|
import time
|
|
import uuid
|
|
from pathlib import Path
|
|
|
|
DEFAULT_DIR = '.pysim-simple-server'
|
|
DEFAULT_FILENAME = 'test_scripts.json'
|
|
SCHEMA_VERSION = 2
|
|
|
|
_ID_RE = re.compile(r'[0-9a-f]{32}')
|
|
|
|
|
|
def default_path():
|
|
"""The default store: ``~/.pysim-simple-server/test_scripts.json``."""
|
|
return Path.home() / DEFAULT_DIR / DEFAULT_FILENAME
|
|
|
|
|
|
class TestScriptError(Exception):
|
|
"""A refused mutation (validation, unknown id, ...)."""
|
|
|
|
|
|
class TestScriptStore:
|
|
"""The test script store. All public methods are thread-safe and return
|
|
copies - callers can never mutate the store's own state."""
|
|
|
|
def __init__(self, path=None, validator=None):
|
|
self.path = Path(path) if path else default_path()
|
|
self._validator = validator
|
|
self._lock = threading.RLock()
|
|
self._scripts = []
|
|
self._load()
|
|
|
|
# ------------------------------------------------------------------ disk
|
|
def _load(self):
|
|
try:
|
|
raw = self.path.read_text(encoding='utf-8')
|
|
except FileNotFoundError:
|
|
self._scripts = []
|
|
return
|
|
except OSError as e:
|
|
sys.stderr.write('TESTSCRIPTS: cannot read %s: %s\n' % (self.path, e))
|
|
self._scripts = []
|
|
return
|
|
try:
|
|
data = json.loads(raw)
|
|
except ValueError as e:
|
|
# Never silently overwrite an unreadable store: keep the file for
|
|
# the user, start empty (the next save would destroy it).
|
|
bad = self.path.with_name(self.path.name + '.bad-%s'
|
|
% time.strftime('%Y%m%d-%H%M%S'))
|
|
try:
|
|
self.path.replace(bad)
|
|
sys.stderr.write('TESTSCRIPTS: %s is not valid JSON (%s) - kept as '
|
|
'%s, starting empty\n' % (self.path, e, bad))
|
|
except OSError:
|
|
sys.stderr.write('TESTSCRIPTS: %s is not valid JSON (%s)\n'
|
|
% (self.path, e))
|
|
self._scripts = []
|
|
return
|
|
items = data.get('scripts') if isinstance(data, dict) else None
|
|
if not isinstance(items, list):
|
|
items = []
|
|
loaded = []
|
|
for entry in items:
|
|
try:
|
|
s = self._normalise(entry, keep_meta=True, validate=False)
|
|
except TestScriptError as e:
|
|
sys.stderr.write('TESTSCRIPTS: dropping an unreadable entry: %s\n' % e)
|
|
continue
|
|
if self._validator is not None:
|
|
try:
|
|
self._validator(copy.deepcopy({'name': s['name'],
|
|
'steps': s['steps']}))
|
|
except Exception as e:
|
|
# Keep it: a tightened rule (or a hand edit) must never
|
|
# destroy a stored script - it is served, fails at run start
|
|
# with the validator's message, and can be fixed in the
|
|
# editor. A later save rewrites the file WITH this entry.
|
|
sys.stderr.write('TESTSCRIPTS: keeping %r - it does not '
|
|
'validate now: %s\n'
|
|
% (s['name'] or '(unnamed)', e))
|
|
loaded.append(s)
|
|
self._scripts = loaded
|
|
|
|
def _save(self):
|
|
data = {'version': SCHEMA_VERSION, 'scripts': self._scripts}
|
|
self.path.parent.mkdir(parents=True, exist_ok=True)
|
|
tmp_fd, tmp_name = tempfile.mkstemp(prefix=self.path.name + '.',
|
|
dir=str(self.path.parent))
|
|
try:
|
|
with os.fdopen(tmp_fd, 'w', encoding='utf-8') as fh:
|
|
json.dump(data, fh, indent=2, ensure_ascii=False)
|
|
fh.write('\n')
|
|
fh.flush()
|
|
os.fsync(fh.fileno())
|
|
os.replace(tmp_name, self.path)
|
|
except Exception:
|
|
try:
|
|
os.unlink(tmp_name)
|
|
except OSError:
|
|
pass
|
|
raise
|
|
try:
|
|
# Make the rename durable. Best effort: opening a directory is not
|
|
# portable (Windows) - a failure here never fails the mutation.
|
|
dir_fd = os.open(str(self.path.parent), os.O_RDONLY)
|
|
try:
|
|
os.fsync(dir_fd)
|
|
finally:
|
|
os.close(dir_fd)
|
|
except OSError:
|
|
pass
|
|
|
|
# ------------------------------------------------------------- shaping
|
|
def _check(self, raw, validate=True):
|
|
"""The script dict, validated: the basic shape always, the full engine
|
|
pass when a validator was provided (and ``validate`` is set - a load
|
|
keeps an entry that no longer validates, the mutation paths refuse it).
|
|
The *input* shape is kept - the engine's normalised output is not meant
|
|
to be re-normalised (it fills defaults like an 'any' PoR check), and the
|
|
runner normalises again at start, so storing what was submitted keeps
|
|
the store re-validatable and hand-editable."""
|
|
if not isinstance(raw, dict):
|
|
raise TestScriptError('script must be an object')
|
|
name = raw.get('name')
|
|
if name is None:
|
|
name = ''
|
|
if not isinstance(name, str):
|
|
raise TestScriptError('script name must be a string')
|
|
steps = raw.get('steps')
|
|
if not isinstance(steps, list) or not steps:
|
|
raise TestScriptError('script must have at least one step')
|
|
for i, step in enumerate(steps):
|
|
if not isinstance(step, dict) or step.get('type') not in ('action', 'expect'):
|
|
raise TestScriptError('step %d must be an action or an expectation'
|
|
% (i + 1))
|
|
suite_id = raw.get('suite_id')
|
|
if suite_id in (None, ''):
|
|
suite_id = None
|
|
else:
|
|
suite_id = str(suite_id).strip().lower()
|
|
if not _ID_RE.fullmatch(suite_id):
|
|
raise TestScriptError('suite_id must be a suite uuid')
|
|
script = {'name': name.strip(), 'suite_id': suite_id,
|
|
'require_adm': bool(raw.get('require_adm')),
|
|
'steps': copy.deepcopy(steps)}
|
|
if validate and self._validator is not None:
|
|
try:
|
|
self._validator(copy.deepcopy(script))
|
|
except Exception as e:
|
|
# testscript.ScriptError is a ValueError: pass its message on
|
|
raise TestScriptError(str(e))
|
|
return script
|
|
|
|
def _normalise(self, entry, keep_meta=False, validate=True):
|
|
"""A stored entry: the validated script plus id and timestamps. With
|
|
``keep_meta`` the stored id/timestamps are preserved (a load), else
|
|
fresh ones are made (an add)."""
|
|
if not isinstance(entry, dict):
|
|
raise TestScriptError('script must be an object')
|
|
script = self._check(entry, validate=validate)
|
|
now = time.time()
|
|
rid = str(entry.get('id') or '').strip().lower()
|
|
if not _ID_RE.fullmatch(rid):
|
|
rid = uuid.uuid4().hex
|
|
if keep_meta:
|
|
created = entry.get('created')
|
|
updated = entry.get('updated')
|
|
created = created if isinstance(created, (int, float)) else now
|
|
updated = updated if isinstance(updated, (int, float)) else created
|
|
else:
|
|
created = updated = now
|
|
return {'id': rid, 'name': script['name'],
|
|
'suite_id': script['suite_id'],
|
|
'require_adm': script['require_adm'],
|
|
'steps': script['steps'],
|
|
'created': created, 'updated': updated}
|
|
|
|
def _find(self, sid):
|
|
sid = str(sid or '').strip().lower()
|
|
for s in self._scripts:
|
|
if s['id'] == sid:
|
|
return s
|
|
return None
|
|
|
|
# -------------------------------------------------------------- public
|
|
def list(self):
|
|
with self._lock:
|
|
return [copy.deepcopy(s) for s in self._scripts]
|
|
|
|
def get(self, sid):
|
|
with self._lock:
|
|
s = self._find(sid)
|
|
return copy.deepcopy(s) if s else None
|
|
|
|
def list_by_suite(self, suite_id):
|
|
"""The scripts attached to one suite (the suite holds their order)."""
|
|
want = str(suite_id or '').strip().lower()
|
|
with self._lock:
|
|
return [copy.deepcopy(s) for s in self._scripts
|
|
if (s.get('suite_id') or '') == want]
|
|
|
|
def orphans(self):
|
|
"""Scripts without a suite (a v1 store, or a hand edit): the server
|
|
attaches them to the imported-scripts suite on startup."""
|
|
with self._lock:
|
|
return [copy.deepcopy(s) for s in self._scripts
|
|
if not s.get('suite_id')]
|
|
|
|
def add(self, script):
|
|
with self._lock:
|
|
s = self._normalise(script or {})
|
|
if self._find(s['id']):
|
|
# a caller-supplied id that is already taken never wins: ids
|
|
# must stay unique (the same guard the import uses)
|
|
s['id'] = uuid.uuid4().hex
|
|
self._scripts.append(s)
|
|
self._save()
|
|
sys.stderr.write('TESTSCRIPTS: added %s (%s)\n'
|
|
% (s['name'] or '(unnamed)', s['id']))
|
|
return copy.deepcopy(s)
|
|
|
|
def update(self, sid, fields):
|
|
"""Partial or full update: name/steps/suite_id/require_adm replaced,
|
|
id and created kept. The suite_id change is the *move* operation's
|
|
write (the HTTP layer updates the source and target suites around
|
|
it)."""
|
|
with self._lock:
|
|
cur = self._find(sid)
|
|
if cur is None:
|
|
return None
|
|
merged = {'name': cur['name'], 'suite_id': cur.get('suite_id'),
|
|
'require_adm': cur.get('require_adm', False),
|
|
'steps': copy.deepcopy(cur['steps'])}
|
|
if isinstance(fields, dict):
|
|
for key in ('name', 'steps', 'suite_id', 'require_adm'):
|
|
if key in fields:
|
|
merged[key] = fields[key]
|
|
script = self._check(merged)
|
|
new = {'id': cur['id'], 'name': script['name'],
|
|
'suite_id': script['suite_id'],
|
|
'require_adm': script['require_adm'],
|
|
'steps': script['steps'], 'created': cur['created'],
|
|
'updated': time.time()}
|
|
self._scripts[self._scripts.index(cur)] = new
|
|
self._save()
|
|
return copy.deepcopy(new)
|
|
|
|
def remove(self, sid):
|
|
with self._lock:
|
|
s = self._find(sid)
|
|
if s is None:
|
|
return False
|
|
self._scripts.remove(s)
|
|
self._save()
|
|
sys.stderr.write('TESTSCRIPTS: removed %s (%s)\n'
|
|
% (s['name'] or '(unnamed)', s['id']))
|
|
return True
|
|
|
|
def import_scripts(self, items, mode='merge', suite_id=None):
|
|
"""Import exported (or old localStorage) scripts: entries are validated
|
|
one by one; an already-used id gets a fresh one, invalid entries are
|
|
reported instead of failing the whole import. ``replace`` wipes the
|
|
store first. ``suite_id`` attaches every imported script to that suite
|
|
(the "import into this suite" flow). Returns the ``id_map`` (input id
|
|
-> stored id, the bundle import's reference remap) and the stored ids
|
|
of the imported scripts (the target suite's member entries)."""
|
|
added, skipped, errors = 0, 0, []
|
|
id_map = {}
|
|
added_ids = []
|
|
with self._lock:
|
|
if mode == 'replace':
|
|
self._scripts = []
|
|
for i, entry in enumerate(items or []):
|
|
if not isinstance(entry, dict):
|
|
skipped += 1
|
|
continue
|
|
try:
|
|
entry = dict(entry)
|
|
if suite_id:
|
|
entry['suite_id'] = suite_id
|
|
s = self._normalise(entry)
|
|
src_id = str(entry.get('id') or '').strip().lower()
|
|
if self._find(s['id']):
|
|
s['id'] = uuid.uuid4().hex
|
|
if _ID_RE.fullmatch(src_id):
|
|
id_map[src_id] = s['id']
|
|
except TestScriptError as e:
|
|
skipped += 1
|
|
errors.append('%s: %s' % (entry.get('name') or ('#' + str(i + 1)), e))
|
|
continue
|
|
self._scripts.append(s)
|
|
added_ids.append(s['id'])
|
|
added += 1
|
|
if added or mode == 'replace':
|
|
self._save()
|
|
sys.stderr.write('TESTSCRIPTS: import %s: %d added, %d skipped\n'
|
|
% (mode, added, skipped))
|
|
return {'added': added, 'skipped': skipped, 'errors': errors[:10],
|
|
'id_map': id_map, 'added_ids': added_ids}
|
|
|
|
def info(self):
|
|
with self._lock:
|
|
return {'path': str(self.path), 'count': len(self._scripts),
|
|
'version': SCHEMA_VERSION}
|