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:
2026-10-06 21:14:07 +03:00
parent a76e0154b6
commit 7d997272ef
9 changed files with 258 additions and 55 deletions
+57
View File
@@ -1360,6 +1360,63 @@ class TestScriptStoreHttpTests(unittest.TestCase):
self.assertEqual(status, 400, resp)
self.assertIn('member set changes', resp['error'])
def test_move_repairs_a_duplicate_listing(self):
# v3.22.3: the move detaches the script from EVERY suite that lists
# it and re-attaches to the target - an inconsistent state (a partial
# move, a stale suite_id) must not answer 500 or leave two owners.
a = self._suite(name='a')
b = self._suite(name='b')
status, resp = self._post('/api/test/scripts', self._script(suite_id=a['id']))
self.assertEqual(status, 200, resp)
sid = resp['script']['id']
# b lists it too: the state a partial move leaves behind
self.suites.update(b['id'], {'scripts': [
{'script_id': sid, 'role': 'member', 'on_fail': 'continue'}]})
status, resp = self._post('/api/test/scripts/update', {
'id': sid, 'script': {'name': 'demo', 'suite_id': b['id']}})
self.assertEqual(status, 200, resp)
self.assertTrue(resp.get('moved'))
self.assertEqual(self.suites.get(a['id'])['scripts'], [])
self.assertEqual([e['script_id'] for e in self.suites.get(b['id'])['scripts']],
[sid])
self.assertEqual(self.store.get(sid)['suite_id'], b['id'])
# the on_fail comes from the explicit owner (the suite_id named a)
self.assertEqual(self.suites.get(b['id'])['scripts'][0]['on_fail'], 'stop')
def test_move_from_a_stale_owner_repairs_the_listing(self):
a = self._suite(name='a')
b = self._suite(name='b')
status, resp = self._post('/api/test/scripts', self._script(suite_id=a['id']))
self.assertEqual(status, 200, resp)
sid = resp['script']['id']
# the suite_id points at a missing suite while a still lists it
self.store.update(sid, {'suite_id': 'f' * 32})
status, resp = self._post('/api/test/scripts/update', {
'id': sid, 'script': {'name': 'demo', 'suite_id': b['id']}})
self.assertEqual(status, 200, resp)
self.assertEqual(self.suites.get(a['id'])['scripts'], [])
self.assertEqual([e['script_id'] for e in self.suites.get(b['id'])['scripts']],
[sid])
self.assertEqual(self.store.get(sid)['suite_id'], b['id'])
def test_move_to_the_same_suite_prunes_a_duplicate(self):
a = self._suite(name='a')
b = self._suite(name='b')
status, resp = self._post('/api/test/scripts', self._script(suite_id=b['id']))
self.assertEqual(status, 200, resp)
sid = resp['script']['id']
# a also lists it; the explicit suite_id names b, whose on_fail stays
self.suites.update(a['id'], {'scripts': [
{'script_id': sid, 'role': 'member', 'on_fail': 'stop'}]})
self.suites.update(b['id'], {'scripts': [
{'script_id': sid, 'role': 'member', 'on_fail': 'continue'}]})
status, resp = self._post('/api/test/scripts/move', {'id': sid, 'suite_id': b['id']})
self.assertEqual(status, 200, resp)
self.assertEqual(self.suites.get(a['id'])['scripts'], [])
self.assertEqual([e['script_id'] for e in self.suites.get(b['id'])['scripts']],
[sid])
self.assertEqual(self.suites.get(b['id'])['scripts'][0]['on_fail'], 'continue')
def test_move_and_copy_between_suites(self):
a = self._suite(name='a')
b = self._suite(name='b')