diff --git a/tests/test_manifests.py b/tests/test_manifests.py index 6efd566..a345002 100644 --- a/tests/test_manifests.py +++ b/tests/test_manifests.py @@ -29,7 +29,8 @@ def rejects(self, document): def test_all_fixtures_validate_with_local_receipts(self): paths = list(DISTRO.glob('*.toml')) + list(MINIMAL.glob('*.toml')) paths += list((CLI / 'tests/fixtures/developer').glob('*.toml')) - paths += [device_path('j71b')] + # An installed package may be reached through a virtualenv lib64 link. + paths += [device_path('j71b').resolve()] for path in paths: with self.subTest(path=path): verify_local_receipts(load(path), path.parent) diff --git a/tests/test_package_boundaries.py b/tests/test_package_boundaries.py index ddfb98e..7068f60 100644 --- a/tests/test_package_boundaries.py +++ b/tests/test_package_boundaries.py @@ -11,7 +11,7 @@ from unittest.mock import Mock, patch from orchard_cli import firmware -from orchard_cli.apple import usb, ipsw +from orchard_cli.apple import usb from orchard_cli.progress import Clock from orchard_cli.state import DeviceState @@ -35,11 +35,11 @@ def find_spec(self, name, path=None, target=None): sys.meta_path.insert(0, NoBoard()) from orchard_cli import downloads, firmware, http, integrity from orchard_cli.transports import ssh -from orchard_cli.apple import adt_tree, adt_capture, macho, osserialize, ipsw, usb, boot +from orchard_cli.apple import adt_tree, adt_capture, macho, osserialize, remote_ipsw, udif, apfs, lzfse, usb, boot from orchard_hardware.apple import adt from orchard_cli.command import main sys.argv=['orchard','distros'];main() -sys.argv=['orchard','resolve',MANIFEST];main() +sys.argv=['orchard','resolve',MANIFEST,'--profile','j71b'];main() '''.replace('MANIFEST', repr(str(FIXTURE.resolve()))) with tempfile.TemporaryDirectory() as store: result = subprocess.run([sys.executable, '-I', '-c', script], cwd=store, diff --git a/tests/test_runtime.py b/tests/test_runtime.py index 3db4e5b..0522ca1 100644 --- a/tests/test_runtime.py +++ b/tests/test_runtime.py @@ -308,7 +308,7 @@ def guard(event, args): sys.addaudithook(guard) from orchard_cli.command import main -sys.argv = ['orchard', 'resolve', INPUT] +sys.argv = ['orchard', 'resolve', INPUT, '--profile', 'j71b'] main() '''.replace('BLOCKED', repr([str(path) for path in blocked])).replace('INPUT', repr(str(inputs / 'index.toml'))) env = {**os.environ, 'ORCHARD_HOME': str(self.root / 'isolated-store'), 'PYTHONDONTWRITEBYTECODE': '1'}