diff --git a/src/orchard_cli/boot.py b/src/orchard_cli/boot.py index 19a0e55..06e1da8 100644 --- a/src/orchard_cli/boot.py +++ b/src/orchard_cli/boot.py @@ -7,6 +7,7 @@ import subprocess import sys +from .apple.boot import run_process_group from .ram import verify_ram @@ -67,8 +68,8 @@ def boot_ram(output, *, yes=False): if device['mode'] == 'dfu': print('Starting Pongo once. Inspect any uncertain failure before retrying.') with (output / 'palera1n.log').open('wb') as log: - subprocess.run([executable, '-p', '-k', str(output / 'pongo.bin')], - check=True, timeout=120, stdout=log, stderr=subprocess.STDOUT) + run_process_group([executable, '-p', '-k', str(output / 'pongo.bin')], + timeout=120, stdout=log, stderr=subprocess.STDOUT) wait_mode(device, 'pongo', chip=chip, board=board, product='', seconds=60) usb.selected(device['location'], ecid, chip=chip, board=board) pongo.upload(output / 'linux.bin', device['location'], receipt['files']['linux.bin']) diff --git a/tests/test_ram.py b/tests/test_ram.py index 148b6f5..c6289f9 100644 --- a/tests/test_ram.py +++ b/tests/test_ram.py @@ -322,7 +322,7 @@ def test_mismatched_dfu_boot_tracks_actual_device_through_pongo(self): patch('orchard_cli.state.operation_lock', return_value=nullcontext()), \ patch('orchard_cli.apple.boot.wait_mode') as wait, \ patch.object(boot.shutil, 'which', return_value='/fake/palera1n'), \ - patch.object(boot.subprocess, 'run') as execute: + patch.object(boot, 'run_process_group') as execute: boot.boot_ram(self.output, yes=True) selected.assert_any_call('fake', 123, chip=0x8011, board=0x04, mode='dfu') selected.assert_any_call('fake', 123, chip=0x8011, board=0x04)