fix: refuse pack flags with pipeline --skip-packs

This commit is contained in:
Abdessamad Derraz committed 2026-10-17 20:30:25 +02:00
1 parent e85819e0e4
commit d6c8186ccb
2 files changed
+45 -1

No files matched your search

+10 -1
View File
@@ -228,9 +228,18 @@ SKIPPED = _Skipped()
def _refuse_unapplied_flags(parser: argparse.ArgumentParser, args) -> None:
"""--all-variants builds every source itself: a --source beside it is dropped."""
"""A flag the run would drop is refused before any step.
--all-variants builds every source itself, so a --source beside it is
dropped; --skip-packs builds none, so both are.
"""
if args.all_variants and args.source != "full":
parser.error("--source is incompatible with --all-variants")
if args.skip_packs:
for flag, on in (("--source", args.source != "full"),
("--all-variants", args.all_variants)):
if on:
parser.error(f"{flag} is incompatible with --skip-packs")
def _truth_steps(args: argparse.Namespace, results: dict) -> bool:
+35
View File
@@ -3332,5 +3332,40 @@ class TheInstallerNamesWhatItSkipped(unittest.TestCase):
self.assertIn("and 2 more", many[1])
class EveryToolRefusesAFlagItWouldDrop(unittest.TestCase):
"""The mode x flag matrix existed for generate_pack only: verify took
--strict in --emulator mode and ignored it, pipeline took --source with
--skip-packs and built nothing. Each pair here must exit non-zero
before doing any work."""
REFUSED = {
"scripts/verify.py": [
["--list-emulators", "--strict"],
["--list-emulators", "--verbose"],
["--list-emulators", "--json"],
["--list-systems", "--region", "us"],
["--emulator", "handy", "--target", "switch"],
["--platform", "retroarch", "--standalone"],
["--platform", "retroarch", "--include-archived"],
],
"scripts/pipeline.py": [
["--offline", "--skip-packs", "--source", "truth"],
["--offline", "--skip-packs", "--all-variants"],
["--offline", "--all-variants", "--source", "platform"],
],
}
def test_each_pair_is_refused(self):
for script, cases in self.REFUSED.items():
for argv in cases:
with self.subTest(script=script, argv=argv):
proc = subprocess.run(
[sys.executable, script, *argv], cwd=ROOT,
capture_output=True, text=True, timeout=120,
)
self.assertEqual(proc.returncode, 2, proc.stdout + proc.stderr)
if __name__ == "__main__":
unittest.main()