v3.22.3: the mismatch on_fail, the self-healing move, the pruning reconciliation
Three test-management issues: - an expectation whose command type did not match the pending command hard-coded level 'error', so on_fail "warning" tolerated "no command pending" but not "a different command is pending". The check now honours the step's on_fail - the tolerant form for "the applet either asks X or does Y" (the mismatched command is still fetched and answered). - moving a script between suites could answer 500 and leave two owners: _test_script_move detached only from the suite named by the script's suite_id and appended to the target unconditionally, so a duplicate listing or a stale suite_id (a hand edit, an interrupted move) collided on the attach. It now detaches from every suite that lists the script, takes the on_fail from the explicit owner (suite_id if that suite lists it, else the first lister), updates the script first (a refused validation changes nothing) and re-attaches with a prune; the same-suite no-op only applies when the target really is the only lister. - reconcile_scripts_to_suites() now prunes duplicate listings to the explicit owner (it only adopted before), so those states self-heal at startup and after a bundle import; the "Imported scripts" suite is only created when there are orphans. Docs: the bundle-import note (importing into the source store duplicates the suite and its scripts - the round-trip is not idempotent) and the expectation on_fail clarification. Tests: 839 frontend + 818 Python; sw cache simple-v407.
This commit is contained in:
@@ -222,6 +222,50 @@ class MigrationTests(unittest.TestCase):
|
||||
# idempotent: nothing left to attach
|
||||
self.assertEqual(srv.migrate_scripts_to_suites(scripts, suites), 0)
|
||||
|
||||
def test_a_duplicate_listing_is_pruned_to_the_explicit_owner(self):
|
||||
# v3.22.3: the reconciliation keeps a script in the suite its
|
||||
# suite_id names and prunes the other listings (a hand edit or an
|
||||
# interrupted move must not leave two owners).
|
||||
from pysim_simple_server import server as srv
|
||||
from pysim_simple_server import test_scripts
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
scripts = test_scripts.TestScriptStore(pathlib.Path(tmp) / 's.json')
|
||||
suites = test_suites.TestSuiteStore(pathlib.Path(tmp) / 'u.json')
|
||||
step = {'type': 'action', 'kind': 'status', 'params': {'attempts': 1}}
|
||||
a = suites.add({'name': 'A'})
|
||||
b = suites.add({'name': 'B'})
|
||||
s = scripts.add({'name': 'x', 'suite_id': b['id'], 'steps': [step]})
|
||||
for su in (a, b):
|
||||
suites.update(su['id'], {'scripts': [
|
||||
{'script_id': s['id'], 'role': 'member', 'on_fail': 'stop'}]})
|
||||
self.assertEqual(srv.reconcile_scripts_to_suites(scripts, suites), 1)
|
||||
self.assertEqual(suites.get(a['id'])['scripts'], [])
|
||||
self.assertEqual([e['script_id'] for e in suites.get(b['id'])['scripts']],
|
||||
[s['id']])
|
||||
self.assertEqual(scripts.get(s['id'])['suite_id'], b['id'])
|
||||
# idempotent
|
||||
self.assertEqual(srv.reconcile_scripts_to_suites(scripts, suites), 0)
|
||||
|
||||
def test_a_duplicate_listing_with_a_stale_owner_keeps_the_first_lister(self):
|
||||
from pysim_simple_server import server as srv
|
||||
from pysim_simple_server import test_scripts
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
scripts = test_scripts.TestScriptStore(pathlib.Path(tmp) / 's.json')
|
||||
suites = test_suites.TestSuiteStore(pathlib.Path(tmp) / 'u.json')
|
||||
step = {'type': 'action', 'kind': 'status', 'params': {'attempts': 1}}
|
||||
a = suites.add({'name': 'A'})
|
||||
b = suites.add({'name': 'B'})
|
||||
s = scripts.add({'name': 'x', 'suite_id': 'f' * 32, 'steps': [step]})
|
||||
for su in (a, b):
|
||||
suites.update(su['id'], {'scripts': [
|
||||
{'script_id': s['id'], 'role': 'member', 'on_fail': 'stop'}]})
|
||||
# the prune of B plus the adoption of the first lister A
|
||||
self.assertEqual(srv.reconcile_scripts_to_suites(scripts, suites), 2)
|
||||
self.assertEqual([e['script_id'] for e in suites.get(a['id'])['scripts']],
|
||||
[s['id']])
|
||||
self.assertEqual(suites.get(b['id'])['scripts'], [])
|
||||
self.assertEqual(scripts.get(s['id'])['suite_id'], a['id'])
|
||||
|
||||
def test_an_invalid_script_is_still_listed_by_the_reconciliation(self):
|
||||
# The script store keeps an entry that no longer validates (a
|
||||
# tightened rule must not destroy it). Its suite_id write is refused
|
||||
|
||||
Reference in New Issue
Block a user