diff --git a/tests/integration/test_packaged_acceptance_guards.py b/tests/integration/test_packaged_acceptance_guards.py index 1f026b8..ef16143 100644 --- a/tests/integration/test_packaged_acceptance_guards.py +++ b/tests/integration/test_packaged_acceptance_guards.py @@ -33,6 +33,30 @@ def test_bom_resource_verifier_accepts_cli_only_reads_without_cad(native_bom_evi assert verifier.verify_bom_resources(root)=={'cad_sessions':0,'ready_native_cli_reads':2} +@pytest.mark.parametrize('fault', [None, 'pending', 'unbound', 'workers_open']) +def test_bom_resource_verifier_checks_batch_release_and_operation_binding(native_bom_evidence, fault): + verifier, root, rows = native_bom_evidence + operations = {} + for i, row in enumerate(rows): + path = root / f'data/tasks/{i}/quick-run-history/native-inventory-ok/native-inventory.json' + row['cleanup'].update(scope='operation', workers_closed=True, desktop_retained_by_batch=True) + path.write_text(json.dumps(row)) + operations[str(path.parent.resolve())] = {'workers_closed': fault != 'workers_open', + 'binding': {'session_id': 'batch', 'generation': 1, 'attempt_id': str(i)}} + if fault == 'unbound': + operations.clear() + path = root / 'data/batch-resources/batch/session.json' + path.parent.mkdir(parents=True) + path.write_text(json.dumps(dict(state='blocked' if fault == 'pending' else 'released', + session_id='batch', generation=1, native_operations=operations, + cleanup=dict(desktop_handle_closed=True, desktop_confirmation={'released':True}, errors=[])))) + if fault: + with pytest.raises(AssertionError): + verifier.verify_bom_resources(root) + else: + assert verifier.verify_bom_resources(root)['ready_native_cli_reads'] == 2 + + @pytest.mark.parametrize('fault',['uncertain','fallback_active_job','fallback_retained_workspace']) def test_bom_resource_verifier_rejects_bad_earlier_attempt_despite_clean_retries(native_bom_evidence,fault): verifier,root,rows=native_bom_evidence diff --git a/tools/accept_packaged_ui.py b/tools/accept_packaged_ui.py index cad70e4..a61db3b 100644 --- a/tools/accept_packaged_ui.py +++ b/tools/accept_packaged_ui.py @@ -99,17 +99,33 @@ def verify_bom_resources(root): path = root / 'desktop-observation-bom.json' verify_observation(path, require_sessions=False) observation = json.loads(path.read_text(encoding='utf-8')) - records = [json.loads(path.read_text(encoding='utf-8')) for path in - (root / 'data/tasks').glob('*/quick-run-history/native-inventory-*/native-inventory.json')] + paths = list((root / 'data/tasks').glob('*/quick-run-history/native-inventory-*/native-inventory.json')) + records = [json.loads(path.read_text(encoding='utf-8')) for path in paths] + batches = [json.loads(path.read_text(encoding='utf-8')) for path in + (root / 'data/batch-resources').glob('*/session.json')] ready = [row for row in records if row['state'] == 'ready'] - for row in records: + for path, row in zip(paths, records): assert row['state'] in {'ready', 'fallback'} and not row.get('cleanup_error') assert row['backend'] == 'native_cli' if row['state'] == 'ready': assert row['source_hashes_unchanged'] assert not Path(row['workspace']).exists() cleanup = row['cleanup'] - assert cleanup['desktop_handle_closed'] and cleanup['desktop_confirmation']['released'] + if cleanup.get('scope') == 'operation': + assert cleanup['workers_closed'] and cleanup['desktop_retained_by_batch'] + owners = [(batch, operation) for batch in batches for evidence, operation in + batch.get('native_operations', {}).items() if Path(evidence).resolve() == path.parent.resolve()] + assert len(owners) == 1, 'Native operation must have exactly one batch owner' + batch, operation = owners[0] + assert batch['state'] == 'released' and operation['workers_closed'] + assert operation['binding']['session_id'] == batch['session_id'] + assert operation['binding']['generation'] == batch['generation'] + assert operation['binding']['attempt_id'] + final = batch['cleanup'] + assert final['desktop_handle_closed'] and final['desktop_confirmation']['released'] + assert not final['errors'] + else: + assert cleanup['desktop_handle_closed'] and cleanup['desktop_confirmation']['released'] assert not cleanup['errors'] if row['state'] == 'ready': assert cleanup['processes']