Skip library dataset tests without hed-tests

The Windows CI checks out without submodules, so the BidsDataset
tests that open the library dataset found no testconflict schema
and failed. Skip them, and split the library half of the summary
test into its own skippable test.

The on-demand download spec test used score 1.0.0, which is
bundled, so the bundle satisfied the lookup and nothing was
downloaded. Use score 1.2.0, guard that it stays unbundled, and
check that it is the only non-bundled file afterward.

Author: VisLab

spec_tests/test_hed_cache.py

@@ -131,12 +131,18 @@ def test_get_hed_version_path_no_auto_refresh_for_custom_directory(self):
     def test_get_hed_version_path_auto_refresh_downloads_missing_version(self):
         """get_hed_version_path downloads only the single requested version from GitHub.
 
-        Uses a score version, which is not bundled with hedtools (only the standard schemas are), so
-        the download must come from GitHub rather than the local bundle. score lives in a normal
-        ``hedxml/`` folder, so this exercises the real on-demand download path (manifest fast path and
-        REST API fallback alike). Only the listing for the relevant library and the one XML file are
-        fetched - not the entire catalog.
+        Uses score 1.2.0, a released library version that hedtools does not bundle in
+        ``hed/schema/schema_data/`` (the bundle has score 1.0.0, 1.1.0, 2.0.0 and 2.1.0), so seeding the
+        fresh cache with the bundle cannot satisfy the lookup and the file must come from GitHub. score
+        lives in a normal ``hedxml/`` folder, so this exercises the real on-demand download path (manifest
+        fast path and REST API fallback alike). Only the listing for the relevant library and the one XML
+        file are fetched - not the entire catalog.
         """
+        # Guard the premise: if this version is ever bundled, the test stops exercising the download.
+        self.assertFalse(
+            os.path.isfile(os.path.join(hed_cache.INSTALLED_CACHE_LOCATION, "HED_score_1.2.0.xml")),
+            "score 1.2.0 is now bundled; pick an unbundled released version for this test",
+        )
         # Use a fresh cache directory so the version is definitely not present
         fresh_cache = os.path.join(os.path.dirname(self.hed_cache_dir), "schema_cache_auto_refresh/")
         if os.path.exists(fresh_cache):
@@ -145,16 +151,22 @@ def test_get_hed_version_path_auto_refresh_downloads_missing_version(self):
         saved = hed_cache.HED_CACHE_DIRECTORY
         try:
             hed_cache.HED_CACHE_DIRECTORY = fresh_cache
-            # score 1.0.0 is a released library version that is NOT bundled - it must come from GitHub.
-            result = hed_cache.get_hed_version_path("1.0.0", library_name="score")
-            self.assertIsNotNone(result, "get_hed_version_path should download score 1.0.0 from GitHub on demand")
+            result = hed_cache.get_hed_version_path("1.2.0", library_name="score")
+            self.assertIsNotNone(result, "get_hed_version_path should download score 1.2.0 from GitHub on demand")
             self.assertTrue(os.path.exists(result))
-            # Only the one requested file should have been downloaded (plus any bundled schemas the
+            # Only the one requested file should have been downloaded (plus the bundled schemas the
             # cache seeds); no full-catalog download.
             xml_files = [f for f in os.listdir(fresh_cache) if hed_cache.version_pattern.match(f)]
-            self.assertTrue(
-                any("score" in f and "1.0.0" in f for f in xml_files),
-                f"HED_score_1.0.0.xml must be in the cache after on-demand download; found: {xml_files}",
+            self.assertIn(
+                "HED_score_1.2.0.xml",
+                xml_files,
+                f"HED_score_1.2.0.xml must be in the cache after on-demand download; found: {xml_files}",
+            )
+            bundled = set(os.listdir(hed_cache.INSTALLED_CACHE_LOCATION))
+            self.assertEqual(
+                [f for f in xml_files if f not in bundled],
+                ["HED_score_1.2.0.xml"],
+                "only the requested file should be downloaded; no full-catalog download",
             )
         finally:
             hed_cache.HED_CACHE_DIRECTORY = saved

tests/schema/util_test_schemas.py

@@ -15,6 +15,7 @@
 TEST_SCHEMAS_DIR = os.path.realpath(
     os.path.join(os.path.dirname(__file__), "../../spec_tests/hed-tests/json_test_data/test_schemas/hedxml")
 )
+SKIP_REASON = "spec_tests/hed-tests is not checked out: git submodule update --init --recursive"
 
 
 def test_schemas_available() -> bool:
@@ -36,5 +37,5 @@ def load_test_schema(versions):
         unittest.SkipTest: When the submodule is not checked out (``git submodule update --init --recursive``).
     """
     if not test_schemas_available():
-        raise unittest.SkipTest("spec_tests/hed-tests is not checked out: git submodule update --init --recursive")
+        raise unittest.SkipTest(SKIP_REASON)
     return load_schema_version(versions, xml_folder=TEST_SCHEMAS_DIR)

tests/tools/bids/test_bids_dataset.py

@@ -11,7 +11,12 @@
 from hed.tools.bids.bids_file_group import BidsFileGroup
 from hed.tools.bids.bids_sidecar_file import BidsSidecarFile
 from hed.tools.bids.bids_tabular_file import BidsTabularFile
-from tests.schema.util_test_schemas import TEST_SCHEMAS_DIR, load_test_schema, test_schemas_available
+from tests.schema.util_test_schemas import (
+    SKIP_REASON,
+    TEST_SCHEMAS_DIR,
+    load_test_schema,
+    test_schemas_available,
+)
 
 
 class Test(unittest.TestCase):
@@ -32,9 +37,10 @@ def setUpClass(cls):
         cls.inherit_path = os.path.join(
             os.path.dirname(os.path.realpath(__file__)), "../../data/bids_tests/eeg_ds003645s_hed_inheritance"
         )
-        # The library dataset's HEDVersion names the hed-tests library testconflict 1.1.2, which BidsDataset
-        # resolves through the schema cache only. Point the cache at a folder seeded with that file, the
-        # bundled standard schemas, and the real cache's score 2.0.0 when it is there (else it downloads).
+        # The library dataset's HEDVersion names score 2.0.0 and the hed-tests library testconflict 1.1.2,
+        # which BidsDataset resolves through the schema cache only. Point the cache at a folder seeded with
+        # the bundled schemas (score 2.0.0 is one of them) and, when hed-tests is checked out, the
+        # testconflict file. Tests that open the library dataset skip without hed-tests.
         cls.saved_cache_dir = hed_cache.HED_CACHE_DIRECTORY
         cls.cache_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../schema_cache_test_bids/")
         shutil.rmtree(cls.cache_dir, ignore_errors=True)
@@ -43,7 +49,6 @@ def setUpClass(cls):
             os.path.join(hed_cache.INSTALLED_CACHE_LOCATION, name)
             for name in os.listdir(hed_cache.INSTALLED_CACHE_LOCATION)
         ]
-        sources.append(os.path.join(cls.saved_cache_dir, "HED_score_2.0.0.xml"))
         if test_schemas_available():
             sources.append(os.path.join(TEST_SCHEMAS_DIR, "HED_testconflict_1.1.2.xml"))
         for source in sources:
@@ -247,6 +252,7 @@ def test_inheritance_no_suffixes(self):
             "The original top-level sidecar should not be overwritten famous_face",
         )
 
+    @unittest.skipUnless(test_schemas_available(), SKIP_REASON)
     def test_libraries(self):
         bids = BidsDataset(self.library_path, suffixes=["participants", "events"])
         self.assertIsInstance(
@@ -306,6 +312,9 @@ def test_get_summary(self):
         self.assertEqual(
             len(summary1["hed_schema_versions"]), 1, "BidsDataset summary hed_schema_versions entry has one schema"
         )
+
+    @unittest.skipUnless(test_schemas_available(), SKIP_REASON)
+    def test_get_summary_libraries(self):
         bids2 = BidsDataset(self.library_path)
         summary2 = bids2.get_summary()
         self.assertIsInstance(summary2, dict, "BidsDataset with libraries has a summary that is a dictionary")
@@ -318,7 +327,7 @@ def test_get_summary(self):
         self.assertEqual(
             len(summary2["hed_schema_versions"]),
             2,
-            "BidsDataset with libraries summary hed_schema_versions list has 3 schema",
+            "BidsDataset with libraries summary hed_schema_versions list has 2 schemas",
         )
         self.assertTrue("dataset" in summary2)