Cleanup

tests/test_build_bootstrap.py

@@ -1,4 +1,4 @@
-import hashlib
+import json
 import importlib.util
 from pathlib import Path
 import sys
@@ -7,15 +7,15 @@ import unittest
 from unittest.mock import Mock, patch
 
 class BuildBootstrapTests(unittest.TestCase):
-  def test_requirements_fingerprint_invalidates_cached_build_image(self):
+  def test_build_recipe_is_declared_and_editor_commands_do_not_bootstrap(self):
     root = Path(__file__).resolve().parents[1]
     spec = importlib.util.spec_from_file_location('vamp_bootstrap', root / 'modulus.py')
     bootstrap = importlib.util.module_from_spec(spec)
     spec.loader.exec_module(bootstrap)
-    digest = hashlib.sha256((root / 'generator/requirements.txt').read_bytes()).hexdigest()
-    self.assertEqual(bootstrap.build_requirements_digest(), digest)
-    self.assertIn(f'build-requirements="{digest}"', bootstrap.product_build_dockerfile())
-    self.assertIn('COPY generator/requirements.txt /tmp/vamp-build-requirements.txt', bootstrap.product_build_dockerfile())
+    docker = json.loads((root / 'modulus.json').read_text())['tooling']['docker']
+    self.assertEqual(docker['socket_commands'], ['build', 'package'])
+    self.assertIn('generator/requirements.txt', docker['inputs'])
+    self.assertIn('COPY generator/requirements.txt /tmp/vamp-build-requirements.txt', (root / docker['dockerfile']).read_text())
     package = types.ModuleType('modulus')
     cli = types.ModuleType('modulus.cli')
     package.cli = cli

tests/test_engraving_cache.py

@@ -1,6 +1,8 @@
 import argparse
+import contextlib
 import copy
 import hashlib
+import io
 import json
 from pathlib import Path
 import tempfile
@@ -9,14 +11,16 @@ from unittest.mock import patch
 
 from generator.__main__ import generate_assets
 from generator.engraving import EngravingError, Fonts, Style, engrave_tree, layout_score
-from generator.engraving.cache import renderer_fingerprint, restore_pages, score_fingerprint
+from generator.engraving.cache import renderer_fingerprint, renderer_namespace, restore_pages, score_fingerprint
+from generator.score import validate_generated_tree
 from tests.test_musicxml import parse, xml_note, xml_score
 
 class EngravingCacheTests(unittest.TestCase):
   def test_ci_snapshot_tracks_all_generator_inputs_and_keeps_fallback(self):
     workflow = Path('.gitea/workflows/ci.yml').read_text()
     self.assertIn("hashFiles('generator/**/*.py', 'generator/*.py', 'data/**/*.xml', 'data/*.xml')", workflow)
-    self.assertIn('restore-keys: product-vamp-pages-v1-${{ runner.os }}-', workflow)
+    self.assertIn('python3 -m generator --renderer-fingerprint', workflow)
+    self.assertIn('restore-keys: product-vamp-pages-v2-${{ steps.renderer.outputs.fingerprint }}-', workflow)
     self.assertIn("if: steps.engraving-cache.outputs.cache-hit != 'true'", workflow)
     self.assertIn('key: ${{ steps.engraving-cache.outputs.cache-primary-key }}', workflow)
   def setUp(self):
@@ -36,7 +40,7 @@ class EngravingCacheTests(unittest.TestCase):
     root = self.root / 'seed'
     self.write_scores(root, [self.document])
     engrave_tree(root, self.fonts, cache_dir=self.cache)
-    return next(self.cache.iterdir())
+    return next(self.cache.rglob('pages.json')).parent
   def test_cache_hit_preserves_bundle_bytes_across_output_directories(self):
     cold, warm = self.root / 'cold', self.root / 'warm'
     self.write_scores(cold, [self.document])
@@ -65,7 +69,7 @@ class EngravingCacheTests(unittest.TestCase):
     with patch('generator.engraving.layout_score', wraps=layout_score) as render:
       engrave_tree(root, self.fonts, cache_dir=self.cache)
     render.assert_called_once()
-    self.assertEqual(len(list(self.cache.iterdir())), 2)
+    self.assertEqual(len(list(self.cache.rglob('pages.json'))), 2)
   def test_renderer_fingerprint_tracks_fonts_style_code_and_dependencies(self):
     fonts, style = Fonts(self.fonts), Style()
     expected = renderer_fingerprint(fonts, style)
@@ -75,6 +79,8 @@ class EngravingCacheTests(unittest.TestCase):
       self.assertNotEqual(expected, renderer_fingerprint(fonts, style))
     with patch('generator.engraving.cache.importlib.metadata.version', return_value='new-version'):
       self.assertNotEqual(expected, renderer_fingerprint(fonts, style))
+    with patch('generator.engraving.cache.platform.python_version', return_value='0.0.0'):
+      self.assertNotEqual(expected, renderer_fingerprint(fonts, style))
     read_bytes = Path.read_bytes
     with patch.object(Path, 'read_bytes', lambda path: read_bytes(path) + (b'\n' if path.name == 'raster.py' else b'')):
       self.assertNotEqual(expected, renderer_fingerprint(fonts, style))
@@ -129,8 +135,46 @@ class EngravingCacheTests(unittest.TestCase):
       self.write_scores(root, documents)
       engrave_tree(root, self.fonts, cache_dir=self.cache, jobs=2)
       self.assertEqual(self.files(serial), self.files(root))
-    self.assertEqual(len(list(self.cache.iterdir())), 2)
-    self.assertFalse(list(self.cache.glob('.engraving-*')))
+    self.assertEqual(len(list(self.cache.rglob('pages.json'))), 2)
+    self.assertFalse(list(self.cache.rglob('.engraving-*')))
+  def test_environment_change_gets_new_namespace_and_clear_progress(self):
+    old = self.seed_cache()
+    root = self.root / 'new-environment'
+    self.write_scores(root, [self.document])
+    progress = io.StringIO()
+    with patch('generator.engraving.cache.platform.python_version', return_value='0.0.0'), contextlib.redirect_stdout(progress):
+      engrave_tree(root, self.fonts, cache_dir=self.cache, progress=True)
+    self.assertIn('cold namespace', progress.getvalue())
+    self.assertIn('0 reused, 1 missing, 0 rejected', progress.getvalue())
+    self.assertTrue((old / 'pages.json').is_file())
+    self.assertEqual(len(list((self.cache / 'v2').iterdir())), 2)
+    self.write_scores(root, [self.document])
+    progress = io.StringIO()
+    with patch('generator.engraving.cache.platform.python_version', return_value='0.0.0'), contextlib.redirect_stdout(progress), patch('generator.engraving.layout_score', side_effect=AssertionError('cache miss')):
+      engrave_tree(root, self.fonts, cache_dir=self.cache, progress=True)
+    self.assertIn('1 reused, 0 missing, 0 rejected', progress.getvalue())
+  def test_namespace_symlink_is_rejected(self):
+    self.cache.mkdir()
+    (self.cache / 'v2').symlink_to(self.root, target_is_directory=True)
+    with self.assertRaisesRegex(ValueError, 'must not be symlinks'):
+      renderer_namespace(self.cache, 'renderer')
+  def test_only_changed_score_is_rendered_and_validation_reads_json_once(self):
+    root = self.root / 'scores'
+    self.write_scores(root, [self.document, self.document])
+    engrave_tree(root, self.fonts, cache_dir=self.cache)
+    changed = parse(xml_score(xml_note('D')))
+    self.write_scores(root, [self.document, changed])
+    with patch('generator.engraving.layout_score', wraps=layout_score) as render:
+      engrave_tree(root, self.fonts, cache_dir=self.cache)
+    render.assert_called_once()
+    read_text = Path.read_text
+    reads = []
+    def read(path, *args, **kwargs):
+      reads.append(path)
+      return read_text(path, *args, **kwargs)
+    with patch.object(Path, 'read_text', read):
+      validate_generated_tree(root)
+    self.assertCountEqual(reads, sorted(root.glob('*.json')))
   def test_invalid_worker_count_and_overlapping_cache_are_rejected(self):
     root = self.root / 'assets'
     self.write_scores(root, [self.document])

tests/test_playback.cpp

@@ -120,10 +120,10 @@ BOOST_AUTO_TEST_CASE(playback_worker_discards_canceled_preparation_and_reports_e
   BOOST_CHECK(!audio.tick(state, loaded, VAMP_TEST_PLAYBACK_ASSETS_DIR));
 }
 
-BOOST_AUTO_TEST_CASE(playback_legacy_config_and_invalid_assets) {
+BOOST_AUTO_TEST_CASE(playback_rejects_legacy_config_and_invalid_assets) {
   auto legacy = vamp_zero::parse_config(boost::json::object{{"audio", {{"track_enabled", true}}}});
-  BOOST_REQUIRE(legacy);
-  BOOST_TEST(legacy->audio.playback_enabled);
+  BOOST_REQUIRE(!legacy);
+  BOOST_TEST(std::string{legacy.error().message()}.find("use audio.playback_enabled") != std::string::npos);
   BOOST_CHECK(!vamp_zero::parse_config(boost::json::object{{"audio", {{"track_enabled", true}, {"playback_enabled", false}}}}));
   auto score = playback_score();
   BOOST_CHECK(!vamp_zero::prepare_playback(score, "/missing-vamp-assets", 120U));