chore: merge integ-2026-11-09

tests/test_e2e.py

@@ -64,6 +64,13 @@ from verify import (
     verify_platform,
 )
 
+try:
+    import jsonschema  # noqa: F401
+except ImportError:
+    HAS_JSONSCHEMA = False
+else:
+    HAS_JSONSCHEMA = True
+
 
 def _h(data: bytes) -> dict:
     """Return sha1, md5, crc32 for test data."""
@@ -6995,6 +7002,7 @@ class OneOfASearchList(unittest.TestCase):
         self.assertTrue(holds_required_members(str(path), members))
         self.assertFalse(holds_required_members(str(path), members[:1] + members[2:]))
 
+    @unittest.skipUnless(HAS_JSONSCHEMA, "validate_schemas needs jsonschema")
     def test_schema_refuses_a_set_split_on_required(self):
         from validate_schemas import _group_requirement_split, ROOT
 

tests/test_launcher_layer.py

@@ -253,7 +253,7 @@ class LauncherLayerTest(unittest.TestCase):
         self.assertNotIn("core.bin", self._pack_names())
 
     def test_a_file_handed_to_an_entry_setting_takes_the_entry_content(self) -> None:
-        """RetroPie runs sdl2trs with -romfile4p $biosdir/level4p.rom and
+        """RetroPie runs sdl2trs with `-romfile4p $biosdir/level4p.rom` and
         EmuDeck writes a No-Intro name into ares's NeoGeoPocket firmware
         setting: neither name is the core's, and the held file of the entry
         that setting reads went in under no name at all."""

tests/test_launcher_paths.py

@@ -277,7 +277,7 @@ class OnlyWhatABoardBuildsIsRun(unittest.TestCase):
     def test_only_what_a_board_builds_or_the_user_supplies_is_run(self):
         from scraper import batocera_scraper as bs
 
-        # A board selects kodi's package and buildroot's mpv; citron is
+        # A board selects kodi's package and buildroot's mpv. Citron is
         # listed by es_systems, so the symbol of a folder of that name does
         # not count for it.
         built = bs.boards_build(

tests/test_standalone_links.py

@@ -257,7 +257,7 @@ class PerSystem(unittest.TestCase):
         )
 
     def test_a_system_placeholder_gives_one_directory_per_system(self) -> None:
-        # Recalbox passes -rompath os.path.join(BIOS, args.system).
+        # Recalbox passes `-rompath os.path.join(BIOS, args.system)`.
         cfg = {
             **config(passes("emu", "/recalbox/share/bios/<system>", "command line -rompath")),
             "systems": {