test(package): migrate bump regressions to bundles

Author: HaoZeke

tests/bump_emit.rs

@@ -21,6 +21,13 @@ fn foss(ver: &str) -> Toolchain {
     }
 }
 
+fn bundle_recipe(out: &std::path::Path, package: &str, filename: &str) -> PathBuf {
+    out.join("easyconfigs")
+        .join(package[..1].to_ascii_lowercase())
+        .join(package)
+        .join(filename)
+}
+
 #[test]
 fn library_bumps_fixture_gromacs_toolchain_only() {
     let src_path = fixture("foss-2025a/GROMACS-2024.1-foss-2025a.eb");
@@ -98,15 +105,20 @@ fn cli_bump_writes_conventional_file() {
             "OpenBLAS=0.3.27",
             "--dep",
             "OpenMPI=5.0.3",
+            "--easyconfigs",
+            fixture("").to_str().unwrap(),
             "--out-dir",
             out_dir.to_str().unwrap(),
         ])
         .status()
         .expect("spawn eb-stack bump");
     assert!(status.success(), "eb-stack bump failed: {status}");
 
-    let written = out_dir.join("GROMACS-2025.0-foss-2025b.eb");
+    let written = bundle_recipe(out_dir, "GROMACS", "GROMACS-2025.0-foss-2025b.eb");
     assert!(written.is_file(), "missing {}", written.display());
+    assert!(out_dir.join("package.plan.json").is_file());
+    assert!(out_dir.join("package.sbom.cdx.json").is_file());
+    assert!(out_dir.join("locks/default.lock.json").is_file());
     let text = std::fs::read_to_string(&written).expect("read written");
     assert!(text.contains("version = '2025.0'"));
     assert!(text.contains("toolchain = {'name': 'foss', 'version': '2025b'}"));
@@ -116,13 +128,13 @@ fn cli_bump_writes_conventional_file() {
 }
 
 #[test]
-fn cli_bump_toolchain_only_twice_idempotent_content() {
+fn cli_bump_resolvo_bundle_is_deterministic() {
     let bin = env!("CARGO_BIN_EXE_eb-stack");
     let src = fixture("foss-2025a/GROMACS-2024.1-foss-2025a.eb");
     let tmp = tempfile::tempdir().expect("tempdir");
 
     for i in 0..2 {
-        let out = tmp.path().join(format!("run{i}.eb"));
+        let out = tmp.path().join(format!("run{i}"));
         let status = Command::new(bin)
             .args([
                 "package",
@@ -133,17 +145,27 @@ fn cli_bump_toolchain_only_twice_idempotent_content() {
                 "foss",
                 "--toolchain-version",
                 "2025b",
-                "--out",
+                "--easyconfigs",
+                fixture("").to_str().unwrap(),
+                "--out-dir",
                 out.to_str().unwrap(),
             ])
             .status()
             .expect("spawn");
         assert!(status.success(), "run {i} failed");
-        let text = std::fs::read_to_string(&out).unwrap();
+        let recipe = bundle_recipe(&out, "GROMACS", "GROMACS-2024.1-foss-2025b.eb");
+        let text = std::fs::read_to_string(&recipe).unwrap();
         assert!(text.contains("toolchain = {'name': 'foss', 'version': '2025b'}"));
         assert!(text.contains("version = '2024.1'"));
+        assert!(out.join("package.sbom.cdx.json").is_file());
+        assert!(out.join("locks/default.lock.json").is_file());
         if i == 1 {
-            let first = std::fs::read_to_string(tmp.path().join("run0.eb")).unwrap();
+            let first = std::fs::read_to_string(bundle_recipe(
+                &tmp.path().join("run0"),
+                "GROMACS",
+                "GROMACS-2024.1-foss-2025b.eb",
+            ))
+            .unwrap();
             assert_eq!(first, text, "two CLI runs must produce identical content");
         }
     }
@@ -199,7 +221,7 @@ fn cli_bump_auto_resolve_from_easyconfigs() {
     let src = gromacs_repro_source();
     let universe = gromacs_repro_universe();
     let tmp = tempfile::tempdir().expect("tempdir");
-    let out = tmp.path().join("out.eb");
+    let out = tmp.path().join("bundle");
 
     let status = Command::new(bin)
         .args([
@@ -213,13 +235,16 @@ fn cli_bump_auto_resolve_from_easyconfigs() {
             "2024a",
             "--easyconfigs",
             universe.to_str().unwrap(),
-            "--out",
+            "--out-dir",
             out.to_str().unwrap(),
         ])
         .status()
         .expect("spawn eb-stack bump --easyconfigs");
     assert!(status.success(), "auto bump failed: {status}");
-    let text = std::fs::read_to_string(&out).expect("read");
+    let recipe = bundle_recipe(&out, "GROMACS", "GROMACS-2024.4-foss-2024a.eb");
+    let text = std::fs::read_to_string(recipe).expect("read");
+    assert!(out.join("package.sbom.cdx.json").is_file());
+    assert!(out.join("locks/default.lock.json").is_file());
     assert!(text.contains("toolchain = {'name': 'foss', 'version': '2024a'}"));
     assert!(text.contains("('Python', '3.12.3')"));
     assert!(text.contains("('mpi4py', '4.0.1')"));

tests/reproduce_real_prs.rs

@@ -358,15 +358,32 @@ fn reproduces_numba_0_60_0_foss_2023b_to_2024a_auto() {
 
 // ---------------------------------------------------------------------------
 // CLI path: the same known bumps an operator or the annual-bump skill runs
-// via `eb-stack bump --easyconfigs …`. CI must exercise this surface, not
+// via `eb-stack package bump --easyconfigs …`. CI must exercise this surface, not
 // only the library API, because flag wiring and exit status are the contract.
 // ---------------------------------------------------------------------------
 
-/// Run `eb-stack bump --easyconfigs` and return the written file contents.
+fn find_named(directory: &Path, name: &str) -> PathBuf {
+    for entry in std::fs::read_dir(directory).expect("read bundle directory") {
+        let path = entry.expect("bundle entry").path();
+        if path.is_dir() {
+            let found = find_named(&path, name);
+            if found.as_os_str().is_empty() {
+                continue;
+            }
+            return found;
+        }
+        if path.file_name().and_then(|value| value.to_str()) == Some(name) {
+            return path;
+        }
+    }
+    PathBuf::new()
+}
+
+/// Run `eb-stack package bump --easyconfigs` and return the bundled recipe.
 fn cli_auto_bump(source: &Path, out_name: &str) -> String {
     let bin = env!("CARGO_BIN_EXE_eb-stack");
     let tmp = tempfile::tempdir().expect("tempdir");
-    let out = tmp.path().join(out_name);
+    let out = tmp.path().join("bundle");
     let status = Command::new(bin)
         .args([
             "package",
@@ -379,7 +396,7 @@ fn cli_auto_bump(source: &Path, out_name: &str) -> String {
             "2024a",
             "--easyconfigs",
             universe_foss_2024a().to_str().unwrap(),
-            "--out",
+            "--out-dir",
             out.to_str().unwrap(),
         ])
         .status()
@@ -389,7 +406,12 @@ fn cli_auto_bump(source: &Path, out_name: &str) -> String {
         "eb-stack bump failed for {}: {status}",
         source.display()
     );
-    std::fs::read_to_string(&out).expect("read CLI output")
+    assert!(out.join("package.plan.json").is_file());
+    assert!(out.join("package.sbom.cdx.json").is_file());
+    assert!(out.join("locks/default.lock.json").is_file());
+    let recipe = find_named(&out.join("easyconfigs"), out_name);
+    assert!(!recipe.as_os_str().is_empty(), "missing {out_name}");
+    std::fs::read_to_string(recipe).expect("read CLI output")
 }
 
 /// CLI auto-bump must match library emit (modulo residual additions).