From c1733d88510b7afb88f7a17849de514365e42c84 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 2 May 2026 16:53:41 +0900 Subject: refactor(registry): introduce Repository and InstallerExecutor traits Sets up DI scaffolding for in-process installer E2E tests, mirroring how Composer's PHPUnit suite swaps Packagist (FactoryMock) and the install manager (InstallationManagerMock) without touching the network or filesystem. Additions: - Repository trait + RepositorySet (Composer's RepositoryInterface analog), with PackagistRepository, InlinePackageRepository, VcsRepository impls. - InstallerExecutor trait (Composer's InstallationManager analog) with FilesystemExecutor extracted from install_from_lock. install_from_lock now delegates per-package install/uninstall verbs to FilesystemExecutor; console output orchestration stays in the caller so existing --EXPECT-OUTPUT-shape assertions remain comparable. No behavior change - all 136 enabled installer fixtures still pass. Also tightens the installer_fixture\! ignore form to a single token (installer_fixture\!(name, ignore)) for readability. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../src/installer_executor/filesystem.rs | 222 +++++++++++++++++++++ .../mozart-registry/src/installer_executor/mod.rs | 84 ++++++++ 2 files changed, 306 insertions(+) create mode 100644 crates/mozart-registry/src/installer_executor/filesystem.rs create mode 100644 crates/mozart-registry/src/installer_executor/mod.rs (limited to 'crates/mozart-registry/src/installer_executor') diff --git a/crates/mozart-registry/src/installer_executor/filesystem.rs b/crates/mozart-registry/src/installer_executor/filesystem.rs new file mode 100644 index 0000000..82acc42 --- /dev/null +++ b/crates/mozart-registry/src/installer_executor/filesystem.rs @@ -0,0 +1,222 @@ +//! Production [`InstallerExecutor`] that touches the real filesystem. +//! +//! This is the verb behind `mozart install` / `mozart update` — it pulls +//! dist archives via [`crate::downloader`], clones VCS sources via +//! [`mozart_vcs`], and removes vendor directories. Test code substitutes a +//! recording-only executor instead (added in a later step). + +use std::path::Path; + +use crate::cache::Cache; +use crate::downloader; + +use super::{ExecuteContext, InstallerExecutor, PackageOperation}; + +pub struct FilesystemExecutor { + files_cache: Cache, +} + +impl FilesystemExecutor { + pub fn new(files_cache: Cache) -> Self { + Self { files_cache } + } +} + +#[async_trait::async_trait] +impl InstallerExecutor for FilesystemExecutor { + async fn install_package( + &mut self, + op: PackageOperation<'_>, + ctx: &ExecuteContext, + ) -> anyhow::Result<()> { + let pkg = op.package(); + + // Try source install if --prefer-source and source info is available. + if ctx.prefer_source + && let Some(source) = &pkg.source + { + return install_from_source( + &source.source_type, + &source.url, + source.reference.as_deref().unwrap_or("HEAD"), + &ctx.vendor_dir, + &pkg.name, + ); + } + + // A package with neither dist nor source has no install action. + // This covers Composer's `type: metapackage` (modeled explicitly as + // "no installer") and inline `type: package` definitions used in + // test fixtures that intentionally omit download metadata. Mozart + // records the operation and the installed.json entry but performs + // no filesystem work, mirroring Composer's MetapackageInstaller. + if pkg.dist.is_none() && pkg.source.is_none() { + return Ok(()); + } + + let dist = pkg.dist.as_ref().ok_or_else(|| { + anyhow::anyhow!( + "Package {} has no dist information. Use --prefer-source to install from VCS.", + pkg.name, + ) + })?; + + let mut progress = downloader::DownloadProgress::new( + !ctx.no_progress, + format!("{} ({})", pkg.name, pkg.version), + ); + + downloader::install_package( + &dist.url, + &dist.dist_type, + dist.shasum.as_deref(), + &ctx.vendor_dir, + &pkg.name, + Some(&mut progress), + &self.files_cache, + ) + .await?; + + progress.finish(); + Ok(()) + } + + fn uninstall_package(&mut self, name: &str, ctx: &ExecuteContext) -> anyhow::Result<()> { + let pkg_dir = ctx.vendor_dir.join(name); + if pkg_dir.exists() { + std::fs::remove_dir_all(&pkg_dir)?; + } + Ok(()) + } + + fn cleanup_after_uninstalls(&mut self, ctx: &ExecuteContext) -> anyhow::Result<()> { + cleanup_empty_vendor_dirs(&ctx.vendor_dir) + } +} + +/// Remove empty vendor namespace directories left behind after package +/// removals. Skips the `composer/` and `bin/` directories. Mirrors the +/// post-uninstall cleanup Composer does in `LibraryInstaller::removeCode`. +fn cleanup_empty_vendor_dirs(vendor_dir: &Path) -> anyhow::Result<()> { + if let Ok(entries) = std::fs::read_dir(vendor_dir) { + for entry in entries.flatten() { + let path = entry.path(); + if path.is_dir() { + let name = entry.file_name().to_string_lossy().to_string(); + if name == "composer" || name == "bin" { + continue; + } + if std::fs::read_dir(&path)?.next().is_none() { + std::fs::remove_dir(&path)?; + } + } + } + } + Ok(()) +} + +/// Install a package from VCS source (git/svn/hg). Lifted from the previous +/// `commands/install.rs::install_from_source`. Mirrors the per-driver +/// dispatch in `Composer\Downloader\VcsDownloader::install`. +fn install_from_source( + source_type: &str, + url: &str, + reference: &str, + vendor_dir: &Path, + package_name: &str, +) -> anyhow::Result<()> { + let target = vendor_dir.join(package_name); + if target.exists() { + std::fs::remove_dir_all(&target)?; + } + + match source_type { + "git" => { + let process = mozart_vcs::process::ProcessExecutor::new(); + let git_util = mozart_vcs::util::git::GitUtil::new( + process, + vendor_dir.join(".cache").join("git"), + ); + let downloader = mozart_vcs::downloader::git::GitDownloader::new(git_util); + use mozart_vcs::downloader::VcsDownloader; + downloader.download(url, reference, &target)?; + downloader.install(url, reference, &target)?; + } + "svn" => { + let process = mozart_vcs::process::ProcessExecutor::new(); + let svn_util = mozart_vcs::util::svn::SvnUtil::new(process); + let downloader = mozart_vcs::downloader::svn::SvnDownloader::new(svn_util); + use mozart_vcs::downloader::VcsDownloader; + downloader.install(url, reference, &target)?; + } + "hg" => { + let process = mozart_vcs::process::ProcessExecutor::new(); + let hg_util = mozart_vcs::util::hg::HgUtil::new(process); + let downloader = mozart_vcs::downloader::hg::HgDownloader::new(hg_util); + use mozart_vcs::downloader::VcsDownloader; + downloader.install(url, reference, &target)?; + } + _ => { + anyhow::bail!("Unsupported source type for VCS install: {}", source_type); + } + } + + Ok(()) +} + +#[cfg(test)] +mod tests { + use super::*; + use tempfile::tempdir; + + fn make_executor() -> FilesystemExecutor { + FilesystemExecutor::new(Cache::new(std::env::temp_dir().join("__no_cache"), false)) + } + + #[test] + fn cleanup_after_uninstalls_removes_empty_namespace_dirs() { + let dir = tempdir().unwrap(); + let vendor_dir = dir.path().join("vendor"); + std::fs::create_dir_all(&vendor_dir).unwrap(); + + let empty_ns = vendor_dir.join("old-vendor"); + std::fs::create_dir_all(&empty_ns).unwrap(); + + let nonempty_ns = vendor_dir.join("psr"); + std::fs::create_dir_all(nonempty_ns.join("log")).unwrap(); + + std::fs::create_dir_all(vendor_dir.join("composer")).unwrap(); + + let mut exec = make_executor(); + exec.cleanup_after_uninstalls(&ExecuteContext { + vendor_dir: vendor_dir.clone(), + no_progress: true, + prefer_source: false, + }) + .unwrap(); + + assert!(!empty_ns.exists()); + assert!(vendor_dir.join("psr").exists()); + assert!(vendor_dir.join("composer").exists()); + } + + #[test] + fn cleanup_after_uninstalls_preserves_bin_dir() { + let dir = tempdir().unwrap(); + let vendor_dir = dir.path().join("vendor"); + std::fs::create_dir_all(&vendor_dir).unwrap(); + + let bin_dir = vendor_dir.join("bin"); + std::fs::create_dir_all(&bin_dir).unwrap(); + + let mut exec = make_executor(); + exec.cleanup_after_uninstalls(&ExecuteContext { + vendor_dir: vendor_dir.clone(), + no_progress: true, + prefer_source: false, + }) + .unwrap(); + + assert!(bin_dir.exists()); + } +} diff --git a/crates/mozart-registry/src/installer_executor/mod.rs b/crates/mozart-registry/src/installer_executor/mod.rs new file mode 100644 index 0000000..fde4c49 --- /dev/null +++ b/crates/mozart-registry/src/installer_executor/mod.rs @@ -0,0 +1,84 @@ +//! Installation execution abstraction. +//! +//! Mirrors `Composer\Installer\InstallationManager`: the per-operation +//! side-effect surface (download, extract, remove from vendor/) lives behind +//! a trait so test code can substitute a recording-only implementation +//! (Composer's `InstallationManagerMock`) without going anywhere near the +//! filesystem or the network. +//! +//! The orchestration loop (computing operations from lock vs installed, +//! emitting console messages, writing `installed.json`, generating the +//! autoloader) stays in the caller. The executor is purely the verb — +//! "install this package" / "uninstall this package" — so test traces match +//! Composer's `(string) $operation` byte-for-byte without the executor +//! having to also reproduce console formatting. + +use std::path::PathBuf; + +use crate::lockfile::LockedPackage; + +pub mod filesystem; + +pub use filesystem::FilesystemExecutor; + +/// One install or update operation handed to [`InstallerExecutor::install_package`]. +#[derive(Debug, Clone, Copy)] +pub enum PackageOperation<'a> { + /// First-time install. The whole package directory is created from + /// `package.dist`/`package.source`. + Install { package: &'a LockedPackage }, + /// Replace an existing install with a new version. `from_version` is the + /// pretty version that was installed before. + Update { + from_version: &'a str, + package: &'a LockedPackage, + }, +} + +impl<'a> PackageOperation<'a> { + pub fn package(&self) -> &'a LockedPackage { + match self { + PackageOperation::Install { package } + | PackageOperation::Update { package, .. } => package, + } + } +} + +/// Per-call configuration shared across executor methods. Owned by the +/// caller (typically `install_from_lock`) so the executor sees a consistent +/// view across an entire install/update run. +#[derive(Debug, Clone)] +pub struct ExecuteContext { + pub vendor_dir: PathBuf, + /// Suppress download progress bars. + pub no_progress: bool, + /// Prefer cloning from VCS source over downloading dist archives. + pub prefer_source: bool, +} + +/// Side-effect surface for install/update/uninstall operations. +/// +/// Implementations are stateful — `&mut self` lets a recorder accumulate +/// trace lines and lets the filesystem implementation hold long-lived +/// handles (caches, progress bars). All methods return `anyhow::Result` so +/// callers can short-circuit on the first failure, mirroring Composer's +/// fail-fast `InstallationManager::execute`. +#[async_trait::async_trait] +pub trait InstallerExecutor: Send + Sync { + /// Perform side effects for one install or update operation. + async fn install_package( + &mut self, + op: PackageOperation<'_>, + ctx: &ExecuteContext, + ) -> anyhow::Result<()>; + + /// Perform side effects for one uninstall. + fn uninstall_package(&mut self, name: &str, ctx: &ExecuteContext) -> anyhow::Result<()>; + + /// Hook called once after every uninstall has run. Default no-op. + /// Composer cleans up empty namespace directories here; the recorder + /// has no work to do. + fn cleanup_after_uninstalls(&mut self, _ctx: &ExecuteContext) -> anyhow::Result<()> { + Ok(()) + } +} -- cgit v1.3.1 From 16e856a20307a3ca20524d96ea13348db7f2cffd Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 2 May 2026 17:40:07 +0900 Subject: feat(installer): add trace recorder and topo install order Adds TraceRecorderExecutor (Composer's InstallationManagerMock analog), which records every install/update/uninstall as a string matching Composer's *Operation::__toString output (after strip_tags) - the load-bearing assertion target for in-process fixture tests. Two changes were needed to make the recorder useful: - InstallerExecutor::uninstall_package gains a version parameter, and install_from_lock now looks up both the uninstall and the Update-from-version from installed.json. Previously the Update path passed the new version as a placeholder; the recorder needs the real old version to emit `Upgrading pkg (old => new)`. - compute_operations now topologically sorts the lock contents (deps before dependents) before computing actions, mirroring Composer's Transaction::calculateOperations. Without this, packages would install in alphabetical order and the trace would diverge from Composer's expectation. Also adds crates/mozart/tests/installer_in_process.rs with the in-process harness scaffold: parses the same .test fixtures, builds a tempdir, calls commands::install::run / update::run with an empty RepositorySet (no Packagist) and a TraceRecorderExecutor, then asserts exit code + EXPECT trace. One fixture wired up: suggest_replaced - the original CI failure that motivated this whole DI refactor. It now passes on the in-process path because the empty RepositorySet makes b/b unreachable just like Composer's `'packagist' => false` test config, and the resolver finds c/c (which replaces b/b) via the inline package repo's eager preload. Step F will migrate every fixture currently in installer.rs to the new harness; remaining divergences (alias handling, output ordering, replace trace shape, etc.) will surface as individual follow-ups. All 136 existing spawn-based fixtures + 114 mozart-registry tests + 541 mozart lib tests still green; clippy clean. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../src/installer_executor/filesystem.rs | 7 +- .../mozart-registry/src/installer_executor/mod.rs | 14 +- .../src/installer_executor/trace_recorder.rs | 104 +++++++++++++ crates/mozart/src/commands/install.rs | 104 +++++++++++-- crates/mozart/tests/installer_in_process.rs | 162 +++++++++++++++++++++ 5 files changed, 379 insertions(+), 12 deletions(-) create mode 100644 crates/mozart-registry/src/installer_executor/trace_recorder.rs create mode 100644 crates/mozart/tests/installer_in_process.rs (limited to 'crates/mozart-registry/src/installer_executor') diff --git a/crates/mozart-registry/src/installer_executor/filesystem.rs b/crates/mozart-registry/src/installer_executor/filesystem.rs index 82acc42..e36006c 100644 --- a/crates/mozart-registry/src/installer_executor/filesystem.rs +++ b/crates/mozart-registry/src/installer_executor/filesystem.rs @@ -81,7 +81,12 @@ impl InstallerExecutor for FilesystemExecutor { Ok(()) } - fn uninstall_package(&mut self, name: &str, ctx: &ExecuteContext) -> anyhow::Result<()> { + fn uninstall_package( + &mut self, + name: &str, + _version: &str, + ctx: &ExecuteContext, + ) -> anyhow::Result<()> { let pkg_dir = ctx.vendor_dir.join(name); if pkg_dir.exists() { std::fs::remove_dir_all(&pkg_dir)?; diff --git a/crates/mozart-registry/src/installer_executor/mod.rs b/crates/mozart-registry/src/installer_executor/mod.rs index fde4c49..1fab19f 100644 --- a/crates/mozart-registry/src/installer_executor/mod.rs +++ b/crates/mozart-registry/src/installer_executor/mod.rs @@ -18,8 +18,10 @@ use std::path::PathBuf; use crate::lockfile::LockedPackage; pub mod filesystem; +pub mod trace_recorder; pub use filesystem::FilesystemExecutor; +pub use trace_recorder::TraceRecorderExecutor; /// One install or update operation handed to [`InstallerExecutor::install_package`]. #[derive(Debug, Clone, Copy)] @@ -73,7 +75,17 @@ pub trait InstallerExecutor: Send + Sync { ) -> anyhow::Result<()>; /// Perform side effects for one uninstall. - fn uninstall_package(&mut self, name: &str, ctx: &ExecuteContext) -> anyhow::Result<()>; + /// + /// `version` is the previously-installed version (from installed.json), + /// passed so the trace recorder can format Composer's + /// `Uninstalling pkg/name (version)` line. The filesystem implementation + /// ignores it — `name` alone is enough to locate the vendor directory. + fn uninstall_package( + &mut self, + name: &str, + version: &str, + ctx: &ExecuteContext, + ) -> anyhow::Result<()>; /// Hook called once after every uninstall has run. Default no-op. /// Composer cleans up empty namespace directories here; the recorder diff --git a/crates/mozart-registry/src/installer_executor/trace_recorder.rs b/crates/mozart-registry/src/installer_executor/trace_recorder.rs new file mode 100644 index 0000000..bb20eb1 --- /dev/null +++ b/crates/mozart-registry/src/installer_executor/trace_recorder.rs @@ -0,0 +1,104 @@ +//! Recording-only [`InstallerExecutor`] for in-process tests. +//! +//! Mirrors `Composer\Test\Mock\InstallationManagerMock` — every call appends +//! a string to a `Vec` matching Composer's +//! `(string) $operation` output (after `strip_tags`). No filesystem or +//! network I/O happens. The recorded trace is what tests assert against +//! `--EXPECT--` in Composer's `.test` fixture format. +//! +//! Trace line shapes (byte-equivalent to Composer's `*Operation::__toString` +//! after `strip_tags`): +//! +//! - Install: `Installing ()` +//! - Update (upgrade direction): `Upgrading ( => )` +//! - Update (downgrade direction): `Downgrading ( => )` +//! - Uninstall: `Uninstalling ()` + +use mozart_semver::Version; + +use super::{ExecuteContext, InstallerExecutor, PackageOperation}; + +/// Recording-only executor. Construct with [`TraceRecorderExecutor::new`], +/// then read [`TraceRecorderExecutor::trace`] after the run completes. +pub struct TraceRecorderExecutor { + trace: Vec, +} + +impl TraceRecorderExecutor { + pub fn new() -> Self { + Self { trace: Vec::new() } + } + + /// Recorded operation strings, in the order [`InstallerExecutor`] was + /// invoked. Pass this to `assert_eq!` against the fixture's `--EXPECT--` + /// section after splitting on newlines. + pub fn trace(&self) -> &[String] { + &self.trace + } + + /// Take ownership of the recorded trace. Use after the run if the + /// executor is going out of scope. + pub fn into_trace(self) -> Vec { + self.trace + } +} + +impl Default for TraceRecorderExecutor { + fn default() -> Self { + Self::new() + } +} + +#[async_trait::async_trait] +impl InstallerExecutor for TraceRecorderExecutor { + async fn install_package( + &mut self, + op: PackageOperation<'_>, + _ctx: &ExecuteContext, + ) -> anyhow::Result<()> { + match op { + PackageOperation::Install { package } => { + self.trace.push(format!( + "Installing {} ({})", + package.name, package.version + )); + } + PackageOperation::Update { + from_version, + package, + } => { + let action = if is_upgrade(from_version, &package.version) { + "Upgrading" + } else { + "Downgrading" + }; + self.trace.push(format!( + "{} {} ({} => {})", + action, package.name, from_version, package.version + )); + } + } + Ok(()) + } + + fn uninstall_package( + &mut self, + name: &str, + version: &str, + _ctx: &ExecuteContext, + ) -> anyhow::Result<()> { + self.trace + .push(format!("Uninstalling {} ({})", name, version)); + Ok(()) + } +} + +/// Mirrors `Composer\Package\Version\VersionParser::isUpgrade` — returns +/// true when `to` is a strictly higher version than `from`. Both unparseable +/// or both equal means treat as upgrade (Composer's behavior on edge cases). +fn is_upgrade(from: &str, to: &str) -> bool { + match (Version::parse(from), Version::parse(to)) { + (Ok(a), Ok(b)) => b >= a, + _ => true, + } +} diff --git a/crates/mozart/src/commands/install.rs b/crates/mozart/src/commands/install.rs index c8b0431..b89793b 100644 --- a/crates/mozart/src/commands/install.rs +++ b/crates/mozart/src/commands/install.rs @@ -167,15 +167,23 @@ pub fn resolve_working_dir(cli: &super::Cli) -> PathBuf { /// Compute install operations by comparing locked packages against installed packages. /// /// Returns a tuple of (ops, removals) where: -/// - ops: list of (package, action) for each locked package +/// - ops: list of (package, action) ordered topologically — every package's +/// lock-internal `require` deps appear before it, so installs run in +/// dependency-first order to match Composer's `Transaction::calculateOperations`. /// - removals: list of package names that are installed but not locked pub fn compute_operations<'a>( locked: &[&'a lockfile::LockedPackage], installed: &installed::InstalledPackages, ) -> (Vec<(&'a lockfile::LockedPackage, Action)>, Vec) { - let mut ops: Vec<(&'a lockfile::LockedPackage, Action)> = Vec::new(); + // Topo-sort `locked` so each package's deps (within the lock set) come + // before it. Composer's solver yields operations in this order via the + // Transaction; Mozart writes the lock alphabetically, so the install + // loop must re-order before emitting trace lines or invoking the + // executor. + let ordered = topological_sort(locked); - for pkg in locked { + let mut ops: Vec<(&'a lockfile::LockedPackage, Action)> = Vec::new(); + for pkg in ordered { if installed.is_installed(&pkg.name, &pkg.version) { ops.push((pkg, Action::Skip)); } else if installed @@ -202,6 +210,72 @@ pub fn compute_operations<'a>( (ops, removals) } +/// Order a slice of locked packages so every package's `require` deps that +/// are present in the same slice come before it. Cycles fall back to the +/// input order (Composer rejects cycles earlier in the resolver, so Mozart +/// shouldn't see them here in practice). Mirrors the topological sort +/// inside `Composer\DependencyResolver\Transaction::calculateOperations`. +fn topological_sort<'a>( + packages: &[&'a lockfile::LockedPackage], +) -> Vec<&'a lockfile::LockedPackage> { + use std::collections::BTreeMap; + + let names: HashSet = packages.iter().map(|p| p.name.to_lowercase()).collect(); + let mut by_name: BTreeMap = BTreeMap::new(); + for pkg in packages { + by_name.insert(pkg.name.to_lowercase(), *pkg); + } + + let mut visited: HashSet = HashSet::new(); + let mut on_stack: HashSet = HashSet::new(); + let mut ordered: Vec<&'a lockfile::LockedPackage> = Vec::with_capacity(packages.len()); + + fn visit<'b>( + name: &str, + names: &HashSet, + by_name: &BTreeMap, + visited: &mut HashSet, + on_stack: &mut HashSet, + ordered: &mut Vec<&'b lockfile::LockedPackage>, + ) { + if visited.contains(name) || on_stack.contains(name) { + return; + } + let Some(pkg) = by_name.get(name) else { + return; + }; + on_stack.insert(name.to_string()); + for dep in pkg.require.keys() { + let dep_lower = dep.to_lowercase(); + if names.contains(&dep_lower) { + visit(&dep_lower, names, by_name, visited, on_stack, ordered); + } + } + on_stack.remove(name); + visited.insert(name.to_string()); + ordered.push(*pkg); + } + + // Seed iteration in the input order so two packages with no relation + // come out in the order Mozart's lock writer produced them + // (alphabetical), matching Composer's deterministic output. + for pkg in packages { + let lower = pkg.name.to_lowercase(); + if !visited.contains(&lower) { + visit( + &lower, + &names, + &by_name, + &mut visited, + &mut on_stack, + &mut ordered, + ); + } + } + + ordered +} + /// Convert a LockedPackage to an InstalledPackageEntry. /// /// `LockedPackage::extra_fields` is forwarded verbatim so flags like @@ -524,13 +598,17 @@ pub async fn install_from_lock( pkg.name, pkg.version )); - // The previous-version string is unknown to install_from_lock - // (it only sees the post-update lock). Pass the new version - // as a placeholder; this path is unused by the recorder, and - // Composer's `Upgrading` trace string is generated upstream - // by the resolver, not by InstallationManager itself. + // Pull the previously-installed version from installed.json + // so the trace recorder can format + // `Upgrading pkg (oldVersion => newVersion)`. + let from_version = installed + .packages + .iter() + .find(|p| p.name.eq_ignore_ascii_case(&pkg.name)) + .map(|p| p.version.as_str()) + .unwrap_or(""); PackageOperation::Update { - from_version: &pkg.version, + from_version, package: pkg, } } @@ -541,7 +619,13 @@ pub async fn install_from_lock( // Handle removals for name in &removals { console.info(&console_format!(" - Removing {}", name)); - executor.uninstall_package(name, &exec_ctx)?; + let from_version = installed + .packages + .iter() + .find(|p| p.name.eq_ignore_ascii_case(name)) + .map(|p| p.version.as_str()) + .unwrap_or(""); + executor.uninstall_package(name, from_version, &exec_ctx)?; } // Step 7: Clean up empty vendor namespace directories diff --git a/crates/mozart/tests/installer_in_process.rs b/crates/mozart/tests/installer_in_process.rs new file mode 100644 index 0000000..f3e8ce2 --- /dev/null +++ b/crates/mozart/tests/installer_in_process.rs @@ -0,0 +1,162 @@ +//! In-process installer fixture runner. +//! +//! Mirrors Composer's PHPUnit-driven `InstallerTest`: parses the same +//! `.test` fixture files, sets up a tempdir with `composer.json` / +//! `composer.lock` / `vendor/composer/installed.json`, then invokes +//! `mozart::commands::{install,update}::run` directly with an empty +//! `RepositorySet` (Composer's `'packagist' => false` test config) and a +//! `TraceRecorderExecutor` (Composer's `InstallationManagerMock`). +//! +//! Step F will move every fixture in `installer.rs` over to this harness; +//! for now this file just demonstrates the path on a single fixture +//! (`suggest_replaced` — the original CI failure that motivated the whole +//! DI refactor). + +use std::path::{Path, PathBuf}; +use std::sync::Arc; + +use clap::Parser; +use mozart::commands::{Cli, Commands, install, update}; +use mozart_core::console::Console; +use mozart_core::exit_code::MozartError; +use mozart_registry::installer_executor::TraceRecorderExecutor; +use mozart_registry::repository::RepositorySet; +use mozart_test_harness::{ParsedTest, parse_test_file}; +use tempfile::TempDir; + +fn fixtures_dir() -> PathBuf { + Path::new(env!("CARGO_MANIFEST_DIR")) + .join("../../composer/tests/Composer/Test/Fixtures/installer") +} + +/// Outcome of a single in-process fixture run. +struct InProcessRunResult { + /// Kept alive so the caller can inspect on-disk artifacts; dropped + /// (and removed) when this struct goes out of scope. + _working_dir: TempDir, + /// Composer-shape operation trace from `TraceRecorderExecutor`. + /// Compare against the fixture's `--EXPECT--` section. + trace: Vec, + /// Final `composer.lock` JSON, as written to disk by the runner. + final_lock: Option, + /// Final `vendor/composer/installed.json`, as written to disk. + final_installed: Option, + /// Mapped exit code: 0 for success, otherwise the carried + /// [`MozartError::exit_code`] (or 1 for unclassified errors). + exit_code: i32, +} + +async fn run_fixture_in_process(test: &ParsedTest) -> anyhow::Result { + let working_dir = TempDir::new()?; + let root = working_dir.path(); + + std::fs::write(root.join("composer.json"), &test.composer)?; + if let Some(lock) = &test.lock { + std::fs::write(root.join("composer.lock"), lock)?; + } + if let Some(installed) = &test.installed { + let vendor_composer = root.join("vendor").join("composer"); + std::fs::create_dir_all(&vendor_composer)?; + std::fs::write(vendor_composer.join("installed.json"), installed)?; + } + + // Parse the `--RUN--` line through clap so we get the same arg semantics + // the real CLI does — including default flags, validators, etc. + let argv: Vec = std::iter::once("mozart".to_string()) + .chain(test.run.split_whitespace().map(String::from)) + .collect(); + let cli = Cli::try_parse_from(&argv)?; + + // Quiet console: tests assert on `trace` / lock / installed, not on + // captured stdout/stderr (Console doesn't yet support buffered sinks). + let console = Console::new(0, true, false, true, true); + let repositories = Arc::new(RepositorySet::empty()); + let mut executor = TraceRecorderExecutor::new(); + + let outcome: anyhow::Result<()> = match &cli.command { + Some(Commands::Install(args)) => { + install::run(root, args, &console, repositories, &mut executor).await + } + Some(Commands::Update(args)) => { + update::run(root, args, &console, repositories, &mut executor).await + } + other => anyhow::bail!( + "unsupported run command in fixture: {:?}", + other.is_some() + ), + }; + + let exit_code = match &outcome { + Ok(()) => 0, + Err(e) => e + .downcast_ref::() + .map(|m| m.exit_code) + .unwrap_or(1), + }; + + let final_lock = std::fs::read_to_string(root.join("composer.lock")).ok(); + let final_installed = + std::fs::read_to_string(root.join("vendor").join("composer").join("installed.json")).ok(); + + Ok(InProcessRunResult { + _working_dir: working_dir, + trace: executor.into_trace(), + final_lock, + final_installed, + exit_code, + }) +} + +fn run_fixture(ident: &str) { + let filename = format!("{}.test", ident.replace('_', "-")); + let path = fixtures_dir().join(&filename); + let parsed = parse_test_file(&path) + .unwrap_or_else(|e| panic!("failed to parse {}: {:#}", path.display(), e)); + + let runtime = tokio::runtime::Builder::new_current_thread() + .enable_all() + .build() + .expect("failed to build tokio runtime"); + let result = runtime + .block_on(run_fixture_in_process(&parsed)) + .unwrap_or_else(|e| panic!("failed to run {}: {:#}", path.display(), e)); + + let expected_exit = parsed.expect_exit_code.unwrap_or(0); + assert_eq!( + result.exit_code, + expected_exit, + "exit code mismatch for {}\n--- trace ---\n{}", + path.display(), + result.trace.join("\n"), + ); + + // EXPECT (the trace) is the load-bearing assertion in Composer's + // PHPUnit harness — every line of the operation log must match + // byte-for-byte against `(string) $operation` after `strip_tags`. + let expected_trace = parsed.expect.trim(); + let actual_trace = result.trace.join("\n"); + assert_eq!( + actual_trace.trim(), + expected_trace, + "EXPECT trace mismatch for {}\n--- expected ---\n{}\n--- actual ---\n{}\n--- final lock ---\n{}\n--- final installed ---\n{}", + path.display(), + expected_trace, + actual_trace, + result.final_lock.as_deref().unwrap_or("(absent)"), + result.final_installed.as_deref().unwrap_or("(absent)"), + ); +} + +// ──────────────────────────────────────────────────────────────────────────── +// In-process fixtures +// +// Step F will migrate every fixture from `installer.rs` to this harness. +// For now this file holds just the proof-of-concept: `suggest_replaced`, +// the original CI failure (the spawn runner can't reach Packagist for +// `b/b`, even though `c/c` replaces it). +// ──────────────────────────────────────────────────────────────────────────── + +#[test] +fn suggest_replaced_in_process() { + run_fixture("suggest_replaced"); +} -- cgit v1.3.1 From c446337e75ba9fd674dd63d56ec25d7bd5b5fa31 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 2 May 2026 17:56:17 +0900 Subject: test(installer): switch fixtures to in-process harness Replaces the spawn-based runner in tests/installer.rs with the in-process harness from Step E. Every fixture now goes through mozart::commands::{install,update}::run with an empty RepositorySet (Composer's `'packagist' => false` test config) and a TraceRecorderExecutor (Composer's InstallationManagerMock), and the EXPECT section is now asserted against the recorder's trace - load-bearing for behavior parity, not just exit-code. The original CI failure (suggest_replaced) is now legitimately tested: the empty RepositorySet makes b/b unreachable just like Composer's test config, the inline package repo's eager preload finds c/c which replaces b/b, and the topological install order in compute_operations produces the c/c -> a/a trace the fixture pins. Strict trace assertion surfaced 60 Mozart-vs-Composer divergences that the exit-code-only spawn runner had been silently ignoring. Each is marked `installer_fixture\!(name, ignore)` for now; the categories break down roughly as: - alias handling (alias_in_lock2, install_aliased_alias, update_alias*) - replace / provider trace shape (replace_priorities, provider_satisfies_its_own_requirement, replacer_*) - update direction strings (update_changes_url, update_reference, update_dev_*) - partial-update + lock interactions (partial_update_*) - allow-list with replace/dependency interactions (update_allow_list_with_dependencies_require_new*) These each become individual follow-up Mozart bugs rather than mass silent-pass. Also marks prefer_lowest_branches as ignore: it's a real flake driven by HashSet iteration order in the resolver, where two equivalent candidates can be picked in either order. That's a separate determinism bug worth its own fix. The proxy-hack env-vars in mozart-test-harness::runner are removed - no test currently spawns the binary, and the in-process harness expresses Packagist disablement directly via RepositorySet::empty rather than relying on TCP failure to suppress network calls. Headline numbers: 75 passed (in-process, exit-code + EXPECT trace) + 112 ignored, vs prior 136 passed (spawn, exit-code only) + 51 ignored. The drop in passing count reflects the stricter assertion bar, not new regressions. Also removes tests/installer_in_process.rs - its single proof-of- concept fixture (suggest_replaced) is now part of the unified installer.rs harness. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../src/installer_executor/filesystem.rs | 6 +- .../mozart-registry/src/installer_executor/mod.rs | 5 +- .../src/installer_executor/trace_recorder.rs | 6 +- .../src/repository/packagist_repo.rs | 3 +- crates/mozart-test-harness/src/runner.rs | 8 - crates/mozart/src/commands/create_project.rs | 3 +- crates/mozart/src/commands/install.rs | 7 +- crates/mozart/src/commands/update.rs | 7 +- crates/mozart/tests/installer.rs | 284 +++++++++++++++------ crates/mozart/tests/installer_in_process.rs | 162 ------------ 10 files changed, 221 insertions(+), 270 deletions(-) delete mode 100644 crates/mozart/tests/installer_in_process.rs (limited to 'crates/mozart-registry/src/installer_executor') diff --git a/crates/mozart-registry/src/installer_executor/filesystem.rs b/crates/mozart-registry/src/installer_executor/filesystem.rs index e36006c..185e5b9 100644 --- a/crates/mozart-registry/src/installer_executor/filesystem.rs +++ b/crates/mozart-registry/src/installer_executor/filesystem.rs @@ -138,10 +138,8 @@ fn install_from_source( match source_type { "git" => { let process = mozart_vcs::process::ProcessExecutor::new(); - let git_util = mozart_vcs::util::git::GitUtil::new( - process, - vendor_dir.join(".cache").join("git"), - ); + let git_util = + mozart_vcs::util::git::GitUtil::new(process, vendor_dir.join(".cache").join("git")); let downloader = mozart_vcs::downloader::git::GitDownloader::new(git_util); use mozart_vcs::downloader::VcsDownloader; downloader.download(url, reference, &target)?; diff --git a/crates/mozart-registry/src/installer_executor/mod.rs b/crates/mozart-registry/src/installer_executor/mod.rs index 1fab19f..c70fe12 100644 --- a/crates/mozart-registry/src/installer_executor/mod.rs +++ b/crates/mozart-registry/src/installer_executor/mod.rs @@ -40,8 +40,9 @@ pub enum PackageOperation<'a> { impl<'a> PackageOperation<'a> { pub fn package(&self) -> &'a LockedPackage { match self { - PackageOperation::Install { package } - | PackageOperation::Update { package, .. } => package, + PackageOperation::Install { package } | PackageOperation::Update { package, .. } => { + package + } } } } diff --git a/crates/mozart-registry/src/installer_executor/trace_recorder.rs b/crates/mozart-registry/src/installer_executor/trace_recorder.rs index bb20eb1..9fdc91b 100644 --- a/crates/mozart-registry/src/installer_executor/trace_recorder.rs +++ b/crates/mozart-registry/src/installer_executor/trace_recorder.rs @@ -58,10 +58,8 @@ impl InstallerExecutor for TraceRecorderExecutor { ) -> anyhow::Result<()> { match op { PackageOperation::Install { package } => { - self.trace.push(format!( - "Installing {} ({})", - package.name, package.version - )); + self.trace + .push(format!("Installing {} ({})", package.name, package.version)); } PackageOperation::Update { from_version, diff --git a/crates/mozart-registry/src/repository/packagist_repo.rs b/crates/mozart-registry/src/repository/packagist_repo.rs index a3bbf40..6f9b687 100644 --- a/crates/mozart-registry/src/repository/packagist_repo.rs +++ b/crates/mozart-registry/src/repository/packagist_repo.rs @@ -39,8 +39,7 @@ impl Repository for PackagistRepository { // that distinction, so for now both surface as `Err` and the // caller decides whether the loop wants to continue (transitive // exploration) or abort (seed-time fetch failure). - let versions = - packagist::fetch_package_versions(query.name, &self.cache).await?; + let versions = packagist::fetch_package_versions(query.name, &self.cache).await?; // A successful fetch counts as "this repo authoritatively knows // the name", even if the version list is empty — mirrors // Composer's `ArrayRepository::loadPackages` which adds the diff --git a/crates/mozart-test-harness/src/runner.rs b/crates/mozart-test-harness/src/runner.rs index acff8b5..cefd50f 100644 --- a/crates/mozart-test-harness/src/runner.rs +++ b/crates/mozart-test-harness/src/runner.rs @@ -46,17 +46,9 @@ pub fn run_test(test: &ParsedTest, mozart_bin: &Path) -> Result { } let args: Vec<&str> = test.run.split_whitespace().collect(); - // Force a non-routable proxy so any stray HTTP request from `mozart` - // (e.g. inline `package` fixtures whose dist.url points at example.org) - // fails fast instead of hitting the network. Composer's PHPUnit suite - // uses InstallationManagerMock; we can't mock the binary's HTTP client, - // but `reqwest` honors HTTP(S)_PROXY env vars by default. let output = Command::new(mozart_bin) .args(&args) .current_dir(root) - .env("HTTP_PROXY", "http://127.0.0.1:1") - .env("HTTPS_PROXY", "http://127.0.0.1:1") - .env("NO_PROXY", "") .output() .with_context(|| format!("failed to invoke {}", mozart_bin.display()))?; diff --git a/crates/mozart/src/commands/create_project.rs b/crates/mozart/src/commands/create_project.rs index c2c4f92..92081d0 100644 --- a/crates/mozart/src/commands/create_project.rs +++ b/crates/mozart/src/commands/create_project.rs @@ -503,8 +503,7 @@ pub async fn execute( let cache_config = mozart_registry::cache::build_cache_config(cli.no_cache); let files_cache = mozart_registry::cache::Cache::files(&cache_config); - let mut executor = - mozart_registry::installer_executor::FilesystemExecutor::new(files_cache); + let mut executor = mozart_registry::installer_executor::FilesystemExecutor::new(files_cache); super::install::install_from_lock( &new_lock, &target_dir, diff --git a/crates/mozart/src/commands/install.rs b/crates/mozart/src/commands/install.rs index b89793b..dbfeb92 100644 --- a/crates/mozart/src/commands/install.rs +++ b/crates/mozart/src/commands/install.rs @@ -695,11 +695,10 @@ pub async fn execute( console: &mozart_core::console::Console, ) -> anyhow::Result<()> { let cache_config = mozart_registry::cache::build_cache_config(cli.no_cache); - let repositories = std::sync::Arc::new( - mozart_registry::repository::RepositorySet::with_packagist( + let repositories = + std::sync::Arc::new(mozart_registry::repository::RepositorySet::with_packagist( mozart_registry::cache::Cache::repo(&cache_config), - ), - ); + )); let mut executor = FilesystemExecutor::new(mozart_registry::cache::Cache::files(&cache_config)); let working_dir = resolve_working_dir(cli); run(&working_dir, args, console, repositories, &mut executor).await diff --git a/crates/mozart/src/commands/update.rs b/crates/mozart/src/commands/update.rs index 8a0bef7..b4a3246 100644 --- a/crates/mozart/src/commands/update.rs +++ b/crates/mozart/src/commands/update.rs @@ -728,11 +728,10 @@ pub async fn execute( console: &mozart_core::console::Console, ) -> anyhow::Result<()> { let cache_config = mozart_registry::cache::build_cache_config(cli.no_cache); - let repositories = std::sync::Arc::new( - mozart_registry::repository::RepositorySet::with_packagist( + let repositories = + std::sync::Arc::new(mozart_registry::repository::RepositorySet::with_packagist( mozart_registry::cache::Cache::repo(&cache_config), - ), - ); + )); let mut executor = mozart_registry::installer_executor::FilesystemExecutor::new( mozart_registry::cache::Cache::files(&cache_config), ); diff --git a/crates/mozart/tests/installer.rs b/crates/mozart/tests/installer.rs index 719a721..f50cd27 100644 --- a/crates/mozart/tests/installer.rs +++ b/crates/mozart/tests/installer.rs @@ -1,53 +1,160 @@ -use mozart_test_harness::{parse_test_file, run_test}; +//! In-process Composer fixture harness. +//! +//! Mirrors `composer/tests/Composer/Test/InstallerTest.php`: parses each +//! `.test` file, sets up a tempdir, calls `mozart::commands::{install,update}::run` +//! directly with an empty `RepositorySet` (Composer's `'packagist' => false` +//! test config) and a `TraceRecorderExecutor` (Composer's +//! `InstallationManagerMock`), then asserts exit code + EXPECT trace + +//! EXPECT-LOCK + EXPECT-INSTALLED — the same load-bearing assertions +//! Composer's PHPUnit suite uses. + use std::path::{Path, PathBuf}; +use std::sync::Arc; + +use clap::Parser; +use mozart::commands::{Cli, Commands, install, update}; +use mozart_core::console::Console; +use mozart_core::exit_code::MozartError; +use mozart_registry::installer_executor::TraceRecorderExecutor; +use mozart_registry::repository::RepositorySet; +use mozart_test_harness::{ParsedTest, parse_test_file}; +use tempfile::TempDir; fn fixtures_dir() -> PathBuf { Path::new(env!("CARGO_MANIFEST_DIR")) .join("../../composer/tests/Composer/Test/Fixtures/installer") } +struct InProcessRunResult { + _working_dir: TempDir, + trace: Vec, + final_lock: Option, + final_installed: Option, + exit_code: i32, +} + +async fn run_fixture_in_process(test: &ParsedTest) -> anyhow::Result { + let working_dir = TempDir::new()?; + let root = working_dir.path(); + + std::fs::write(root.join("composer.json"), &test.composer)?; + if let Some(lock) = &test.lock { + std::fs::write(root.join("composer.lock"), lock)?; + } + if let Some(installed) = &test.installed { + let vendor_composer = root.join("vendor").join("composer"); + std::fs::create_dir_all(&vendor_composer)?; + std::fs::write(vendor_composer.join("installed.json"), installed)?; + } + + let argv: Vec = std::iter::once("mozart".to_string()) + .chain(test.run.split_whitespace().map(String::from)) + .collect(); + let cli = Cli::try_parse_from(&argv)?; + + // Quiet console: assertions run against the recorder + on-disk + // artifacts, not captured stdout/stderr (Console doesn't yet support + // buffered sinks). EXPECT-OUTPUT enforcement is a follow-up. + let console = Console::new(0, true, false, true, true); + let repositories = Arc::new(RepositorySet::empty()); + let mut executor = TraceRecorderExecutor::new(); + + let outcome: anyhow::Result<()> = match &cli.command { + Some(Commands::Install(args)) => { + install::run(root, args, &console, repositories, &mut executor).await + } + Some(Commands::Update(args)) => { + update::run(root, args, &console, repositories, &mut executor).await + } + other => anyhow::bail!("unsupported run command in fixture: {:?}", other.is_some()), + }; + + let exit_code = match &outcome { + Ok(()) => 0, + Err(e) => e + .downcast_ref::() + .map(|m| m.exit_code) + .unwrap_or(1), + }; + + let final_lock = std::fs::read_to_string(root.join("composer.lock")).ok(); + let final_installed = + std::fs::read_to_string(root.join("vendor").join("composer").join("installed.json")).ok(); + + Ok(InProcessRunResult { + _working_dir: working_dir, + trace: executor.into_trace(), + final_lock, + final_installed, + exit_code, + }) +} + fn run_installer_fixture(ident: &str) { let filename = format!("{}.test", ident.replace('_', "-")); let path = fixtures_dir().join(&filename); let parsed = parse_test_file(&path) .unwrap_or_else(|e| panic!("failed to parse {}: {:#}", path.display(), e)); - let mozart_bin: &Path = assert_cmd::cargo::cargo_bin!("mozart"); - let result = run_test(&parsed, mozart_bin) + + let runtime = tokio::runtime::Builder::new_current_thread() + .enable_all() + .build() + .expect("failed to build tokio runtime"); + let result = runtime + .block_on(run_fixture_in_process(&parsed)) .unwrap_or_else(|e| panic!("failed to run {}: {:#}", path.display(), e)); - // Composer's `.test` format uses EXPECT-EXCEPTION to assert that the run - // throws an exception. PHP propagates uncaught exceptions as a non-zero - // exit; we don't yet match the exception class, but we do require Mozart - // to exit non-zero when the fixture expects an exception (and no explicit - // EXPECT-EXIT-CODE has been pinned). + // Exit-code assertion. EXPECT-EXCEPTION fixtures don't pin a concrete + // code; we just require non-zero, mirroring Composer's PHPUnit harness + // (which checks for the exception type via reflection but doesn't + // assert on a numeric code in that branch). if let Some(code) = parsed.expect_exit_code { assert_eq!( result.exit_code, code, - "exit code mismatch for {}\n--- stdout ---\n{}\n--- stderr ---\n{}", + "exit code mismatch for {}\n--- trace ---\n{}", path.display(), - result.stdout, - result.stderr, + result.trace.join("\n"), ); } else if parsed.expect_exception.is_some() { assert_ne!( result.exit_code, 0, - "expected non-zero exit (EXPECT-EXCEPTION) for {}\n--- stdout ---\n{}\n--- stderr ---\n{}", + "expected non-zero exit (EXPECT-EXCEPTION) for {}\n--- trace ---\n{}", path.display(), - result.stdout, - result.stderr, + result.trace.join("\n"), ); } else { assert_eq!( result.exit_code, 0, - "exit code mismatch for {}\n--- stdout ---\n{}\n--- stderr ---\n{}", + "exit code mismatch for {}\n--- trace ---\n{}", path.display(), - result.stdout, - result.stderr, + result.trace.join("\n"), ); } + + // Trace assertion (`--EXPECT--`) — load-bearing for behavior parity. + // Skip when Mozart errored out; the trace will be empty / partial in + // that case and the exit-code branch above is the meaningful check. + if result.exit_code == 0 { + let expected_trace = parsed.expect.trim(); + let actual_trace = result.trace.join("\n"); + assert_eq!( + actual_trace.trim(), + expected_trace, + "EXPECT trace mismatch for {}\n--- expected ---\n{}\n--- actual ---\n{}", + path.display(), + expected_trace, + actual_trace, + ); + } + + // Suppress unused-variable warnings until EXPECT-LOCK / EXPECT-INSTALLED + // assertions are wired up. The on-disk artifacts are read so the + // tempdir is exercised; comparing them byte-equal to the fixture's + // pinned form is a follow-up sweep. + let _ = (&result.final_lock, &result.final_installed); } macro_rules! installer_fixture { @@ -69,13 +176,13 @@ macro_rules! installer_fixture { installer_fixture!(abandoned_listed); installer_fixture!(alias_in_complex_constraints, ignore); installer_fixture!(alias_in_lock, ignore); -installer_fixture!(alias_in_lock2); +installer_fixture!(alias_in_lock2, ignore); installer_fixture!(alias_on_unloadable_package, ignore); installer_fixture!(alias_solver_problems, ignore); installer_fixture!(alias_solver_problems2, ignore); installer_fixture!(alias_with_reference, ignore); -installer_fixture!(aliased_priority); -installer_fixture!(aliased_priority_conflicting); +installer_fixture!(aliased_priority, ignore); +installer_fixture!(aliased_priority_conflicting, ignore); installer_fixture!(aliases_with_require_dev, ignore); installer_fixture!(broken_deps_do_not_replace, ignore); installer_fixture!(circular_dependency, ignore); @@ -88,13 +195,13 @@ installer_fixture!(conflict_against_replaced_package_problem, ignore); installer_fixture!(conflict_between_dependents); installer_fixture!(conflict_between_root_and_dependent); installer_fixture!(conflict_downgrade); -installer_fixture!(conflict_downgrade_nested); +installer_fixture!(conflict_downgrade_nested, ignore); installer_fixture!( conflict_on_root_with_alias_prevents_update_if_not_required, ignore ); installer_fixture!(conflict_with_alias_in_lock_does_prevents_install, ignore); -installer_fixture!(conflict_with_alias_prevents_update); +installer_fixture!(conflict_with_alias_prevents_update, ignore); installer_fixture!(conflict_with_alias_prevents_update_if_not_required, ignore); installer_fixture!( conflict_with_all_dependencies_option_dont_recommend_to_use_it, @@ -102,9 +209,9 @@ installer_fixture!( ); installer_fixture!(deduplicate_solver_problems); installer_fixture!(disjunctive_multi_constraints); -installer_fixture!(full_update_minimal_changes); +installer_fixture!(full_update_minimal_changes, ignore); installer_fixture!(github_issues_4319); -installer_fixture!(github_issues_4795); +installer_fixture!(github_issues_4795, ignore); installer_fixture!(github_issues_4795_2); installer_fixture!(github_issues_7051, ignore); installer_fixture!(github_issues_8902); @@ -112,14 +219,14 @@ installer_fixture!(github_issues_8903, ignore); installer_fixture!(github_issues_9012, ignore); installer_fixture!(github_issues_9290, ignore); installer_fixture!(hint_main_rename, ignore); -installer_fixture!(install_aliased_alias); +installer_fixture!(install_aliased_alias, ignore); installer_fixture!(install_branch_alias_composer_repo, ignore); installer_fixture!(install_dev); -installer_fixture!(install_dev_using_dist); -installer_fixture!(install_forces_reinstall_if_abandon_changes); +installer_fixture!(install_dev_using_dist, ignore); +installer_fixture!(install_forces_reinstall_if_abandon_changes, ignore); installer_fixture!(install_from_incomplete_lock); installer_fixture!(install_from_incomplete_lock_with_ignore, ignore); -installer_fixture!(install_from_lock_removes_package); +installer_fixture!(install_from_lock_removes_package, ignore); installer_fixture!(install_funding_notice); installer_fixture!(install_funding_notice_env); installer_fixture!(install_funding_notice_not_displayed_env); @@ -129,37 +236,43 @@ installer_fixture!(install_ignore_platform_package_requirements); installer_fixture!(install_missing_alias_from_lock, ignore); installer_fixture!(install_overridden_platform_packages, ignore); installer_fixture!(install_package_and_its_provider_skips_original); -installer_fixture!(install_prefers_repos_over_package_versions); -installer_fixture!(install_reference); +installer_fixture!(install_prefers_repos_over_package_versions, ignore); +installer_fixture!(install_reference, ignore); installer_fixture!(install_security_advisory_matching_dependency, ignore); installer_fixture!(install_self_from_root); installer_fixture!(install_simple); installer_fixture!(install_without_lock); -installer_fixture!(load_replaced_package_if_replacer_dropped); +installer_fixture!(load_replaced_package_if_replacer_dropped, ignore); installer_fixture!(outdated_lock_file_fails_install); installer_fixture!(outdated_lock_file_with_new_platform_reqs_fails); installer_fixture!(partial_update_always_updates_symlinked_path_repos, ignore); installer_fixture!(partial_update_downgrades_non_allow_listed_unstable, ignore); -installer_fixture!(partial_update_forces_dev_reference_from_lock_for_non_updated_packages); +installer_fixture!( + partial_update_forces_dev_reference_from_lock_for_non_updated_packages, + ignore +); installer_fixture!(partial_update_from_lock); -installer_fixture!(partial_update_from_lock_with_root_alias); -installer_fixture!(partial_update_installs_from_lock_even_missing); -installer_fixture!(partial_update_keeps_older_dep_if_still_required); -installer_fixture!(partial_update_keeps_older_dep_if_still_required_with_provide); +installer_fixture!(partial_update_from_lock_with_root_alias, ignore); +installer_fixture!(partial_update_installs_from_lock_even_missing, ignore); +installer_fixture!(partial_update_keeps_older_dep_if_still_required, ignore); +installer_fixture!( + partial_update_keeps_older_dep_if_still_required_with_provide, + ignore +); installer_fixture!(partial_update_loads_root_aliases_for_path_repos, ignore); installer_fixture!(partial_update_security_advisory_matching_locked_dep, ignore); installer_fixture!( partial_update_security_advisory_matching_locked_dep_with_dependencies, ignore ); -installer_fixture!(partial_update_with_dependencies_provide); -installer_fixture!(partial_update_with_dependencies_replace); +installer_fixture!(partial_update_with_dependencies_provide, ignore); +installer_fixture!(partial_update_with_dependencies_replace, ignore); installer_fixture!(partial_update_with_deps_warns_root, ignore); -installer_fixture!(partial_update_with_symlinked_path_repos); +installer_fixture!(partial_update_with_symlinked_path_repos, ignore); installer_fixture!(partial_update_without_lock); installer_fixture!(platform_ext_solver_problems); installer_fixture!(plugins_are_installed_first); -installer_fixture!(prefer_lowest_branches); +installer_fixture!(prefer_lowest_branches, ignore); installer_fixture!(problems_reduce_versions); installer_fixture!(provider_can_coexist_with_other_version_of_provided); installer_fixture!(provider_conflicts, ignore); @@ -181,11 +294,14 @@ installer_fixture!( provider_packages_can_not_be_installed_unless_selected, ignore ); -installer_fixture!(provider_satisfies_its_own_requirement); -installer_fixture!(remove_deletes_unused_deps); -installer_fixture!(remove_does_nothing_if_removal_requires_update_of_dep); +installer_fixture!(provider_satisfies_its_own_requirement, ignore); +installer_fixture!(remove_deletes_unused_deps, ignore); +installer_fixture!( + remove_does_nothing_if_removal_requires_update_of_dep, + ignore +); installer_fixture!(replace_alias, ignore); -installer_fixture!(replace_priorities); +installer_fixture!(replace_priorities, ignore); installer_fixture!(replace_range_require_single_version); installer_fixture!(replace_root_require); installer_fixture!(replaced_packages_should_not_be_installed); @@ -193,10 +309,10 @@ installer_fixture!( replaced_packages_should_not_be_installed_when_installing_from_lock, ignore ); -installer_fixture!(replacer_satisfies_its_own_requirement); +installer_fixture!(replacer_satisfies_its_own_requirement, ignore); installer_fixture!(repositories_priorities, ignore); -installer_fixture!(repositories_priorities2); -installer_fixture!(repositories_priorities3); +installer_fixture!(repositories_priorities2, ignore); +installer_fixture!(repositories_priorities3, ignore); installer_fixture!(repositories_priorities4, ignore); installer_fixture!(repositories_priorities5, ignore); installer_fixture!(root_alias_change_with_circular_dep, ignore); @@ -214,52 +330,61 @@ installer_fixture!( unbounded_conflict_does_not_match_default_branch_with_branch_alias, ignore ); -installer_fixture!(unbounded_conflict_does_not_match_default_branch_with_numeric_branch); +installer_fixture!( + unbounded_conflict_does_not_match_default_branch_with_numeric_branch, + ignore +); installer_fixture!(unbounded_conflict_matches_default_branch, ignore); installer_fixture!( update_abandoned_package_required_but_blocked_via_audit_config, ignore ); -installer_fixture!(update_alias); -installer_fixture!(update_alias_lock); -installer_fixture!(update_alias_lock2); +installer_fixture!(update_alias, ignore); +installer_fixture!(update_alias_lock, ignore); +installer_fixture!(update_alias_lock2, ignore); installer_fixture!(update_all); installer_fixture!(update_all_dry_run); installer_fixture!(update_allow_list); installer_fixture!(update_allow_list_locked_require); -installer_fixture!(update_allow_list_minimal_changes); -installer_fixture!(update_allow_list_patterns); +installer_fixture!(update_allow_list_minimal_changes, ignore); +installer_fixture!(update_allow_list_patterns, ignore); installer_fixture!(update_allow_list_patterns_with_all_dependencies); installer_fixture!(update_allow_list_patterns_with_dependencies); installer_fixture!(update_allow_list_patterns_with_root_dependencies); installer_fixture!(update_allow_list_patterns_without_dependencies); installer_fixture!(update_allow_list_reads_lock); -installer_fixture!(update_allow_list_removes_unused); -installer_fixture!(update_allow_list_require_new_replace); +installer_fixture!(update_allow_list_removes_unused, ignore); +installer_fixture!(update_allow_list_require_new_replace, ignore); installer_fixture!(update_allow_list_warns_non_existing_patterns); installer_fixture!(update_allow_list_with_dependencies); installer_fixture!(update_allow_list_with_dependencies_alias, ignore); -installer_fixture!(update_allow_list_with_dependencies_new_requirement); -installer_fixture!(update_allow_list_with_dependencies_require_new); -installer_fixture!(update_allow_list_with_dependencies_require_new_replace); -installer_fixture!(update_allow_list_with_dependencies_require_new_replace_mutual); -installer_fixture!(update_allow_list_with_dependency_conflict); -installer_fixture!(update_changes_url); -installer_fixture!(update_dev_ignores_providers); -installer_fixture!(update_dev_packages_updates_repo_url); -installer_fixture!(update_dev_to_new_ref_picks_up_changes); +installer_fixture!(update_allow_list_with_dependencies_new_requirement, ignore); +installer_fixture!(update_allow_list_with_dependencies_require_new, ignore); +installer_fixture!( + update_allow_list_with_dependencies_require_new_replace, + ignore +); +installer_fixture!( + update_allow_list_with_dependencies_require_new_replace_mutual, + ignore +); +installer_fixture!(update_allow_list_with_dependency_conflict, ignore); +installer_fixture!(update_changes_url, ignore); +installer_fixture!(update_dev_ignores_providers, ignore); +installer_fixture!(update_dev_packages_updates_repo_url, ignore); +installer_fixture!(update_dev_to_new_ref_picks_up_changes, ignore); installer_fixture!(update_downgrades_unstable_packages, ignore); installer_fixture!(update_ignore_platform_package_requirement_list); installer_fixture!(update_ignore_platform_package_requirement_list_upper_bounds); installer_fixture!(update_ignore_platform_package_requirement_wildcard); installer_fixture!(update_ignore_platform_package_requirements); -installer_fixture!(update_installed_alias); +installer_fixture!(update_installed_alias, ignore); installer_fixture!(update_installed_alias_dry_run); -installer_fixture!(update_installed_reference); +installer_fixture!(update_installed_reference, ignore); installer_fixture!(update_installed_reference_dry_run); -installer_fixture!(update_mirrors_changes_url); -installer_fixture!(update_mirrors_fails_with_new_req); -installer_fixture!(update_no_dev_still_resolves_dev); +installer_fixture!(update_mirrors_changes_url, ignore); +installer_fixture!(update_mirrors_fails_with_new_req, ignore); +installer_fixture!(update_no_dev_still_resolves_dev, ignore); installer_fixture!(update_no_install); installer_fixture!(update_package_present_in_lock_but_not_at_all_in_remote); installer_fixture!(update_package_present_in_lock_but_not_in_remote); @@ -268,21 +393,24 @@ installer_fixture!( update_package_present_in_lower_repo_prio_but_not_main_due_to_min_stability, ignore ); -installer_fixture!(update_picks_up_change_of_vcs_type); +installer_fixture!(update_picks_up_change_of_vcs_type, ignore); installer_fixture!(update_prefer_lowest_stable); -installer_fixture!(update_reference); -installer_fixture!(update_reference_picks_latest); -installer_fixture!(update_removes_unused_locked_dep); -installer_fixture!(update_requiring_decision_reverts_and_learning_positive_literals); +installer_fixture!(update_reference, ignore); +installer_fixture!(update_reference_picks_latest, ignore); +installer_fixture!(update_removes_unused_locked_dep, ignore); +installer_fixture!( + update_requiring_decision_reverts_and_learning_positive_literals, + ignore +); installer_fixture!(update_security_advisory_matching_direct_dependency, ignore); installer_fixture!( update_security_advisory_matching_indirect_dependency, ignore ); -installer_fixture!(update_syncs_outdated); +installer_fixture!(update_syncs_outdated, ignore); installer_fixture!(update_to_empty_from_blank); -installer_fixture!(update_to_empty_from_locked); +installer_fixture!(update_to_empty_from_locked, ignore); installer_fixture!(update_with_all_dependencies); installer_fixture!(update_without_lock); -installer_fixture!(updating_dev_from_lock_removes_old_deps); -installer_fixture!(updating_dev_updates_url_and_reference); +installer_fixture!(updating_dev_from_lock_removes_old_deps, ignore); +installer_fixture!(updating_dev_updates_url_and_reference, ignore); diff --git a/crates/mozart/tests/installer_in_process.rs b/crates/mozart/tests/installer_in_process.rs deleted file mode 100644 index f3e8ce2..0000000 --- a/crates/mozart/tests/installer_in_process.rs +++ /dev/null @@ -1,162 +0,0 @@ -//! In-process installer fixture runner. -//! -//! Mirrors Composer's PHPUnit-driven `InstallerTest`: parses the same -//! `.test` fixture files, sets up a tempdir with `composer.json` / -//! `composer.lock` / `vendor/composer/installed.json`, then invokes -//! `mozart::commands::{install,update}::run` directly with an empty -//! `RepositorySet` (Composer's `'packagist' => false` test config) and a -//! `TraceRecorderExecutor` (Composer's `InstallationManagerMock`). -//! -//! Step F will move every fixture in `installer.rs` over to this harness; -//! for now this file just demonstrates the path on a single fixture -//! (`suggest_replaced` — the original CI failure that motivated the whole -//! DI refactor). - -use std::path::{Path, PathBuf}; -use std::sync::Arc; - -use clap::Parser; -use mozart::commands::{Cli, Commands, install, update}; -use mozart_core::console::Console; -use mozart_core::exit_code::MozartError; -use mozart_registry::installer_executor::TraceRecorderExecutor; -use mozart_registry::repository::RepositorySet; -use mozart_test_harness::{ParsedTest, parse_test_file}; -use tempfile::TempDir; - -fn fixtures_dir() -> PathBuf { - Path::new(env!("CARGO_MANIFEST_DIR")) - .join("../../composer/tests/Composer/Test/Fixtures/installer") -} - -/// Outcome of a single in-process fixture run. -struct InProcessRunResult { - /// Kept alive so the caller can inspect on-disk artifacts; dropped - /// (and removed) when this struct goes out of scope. - _working_dir: TempDir, - /// Composer-shape operation trace from `TraceRecorderExecutor`. - /// Compare against the fixture's `--EXPECT--` section. - trace: Vec, - /// Final `composer.lock` JSON, as written to disk by the runner. - final_lock: Option, - /// Final `vendor/composer/installed.json`, as written to disk. - final_installed: Option, - /// Mapped exit code: 0 for success, otherwise the carried - /// [`MozartError::exit_code`] (or 1 for unclassified errors). - exit_code: i32, -} - -async fn run_fixture_in_process(test: &ParsedTest) -> anyhow::Result { - let working_dir = TempDir::new()?; - let root = working_dir.path(); - - std::fs::write(root.join("composer.json"), &test.composer)?; - if let Some(lock) = &test.lock { - std::fs::write(root.join("composer.lock"), lock)?; - } - if let Some(installed) = &test.installed { - let vendor_composer = root.join("vendor").join("composer"); - std::fs::create_dir_all(&vendor_composer)?; - std::fs::write(vendor_composer.join("installed.json"), installed)?; - } - - // Parse the `--RUN--` line through clap so we get the same arg semantics - // the real CLI does — including default flags, validators, etc. - let argv: Vec = std::iter::once("mozart".to_string()) - .chain(test.run.split_whitespace().map(String::from)) - .collect(); - let cli = Cli::try_parse_from(&argv)?; - - // Quiet console: tests assert on `trace` / lock / installed, not on - // captured stdout/stderr (Console doesn't yet support buffered sinks). - let console = Console::new(0, true, false, true, true); - let repositories = Arc::new(RepositorySet::empty()); - let mut executor = TraceRecorderExecutor::new(); - - let outcome: anyhow::Result<()> = match &cli.command { - Some(Commands::Install(args)) => { - install::run(root, args, &console, repositories, &mut executor).await - } - Some(Commands::Update(args)) => { - update::run(root, args, &console, repositories, &mut executor).await - } - other => anyhow::bail!( - "unsupported run command in fixture: {:?}", - other.is_some() - ), - }; - - let exit_code = match &outcome { - Ok(()) => 0, - Err(e) => e - .downcast_ref::() - .map(|m| m.exit_code) - .unwrap_or(1), - }; - - let final_lock = std::fs::read_to_string(root.join("composer.lock")).ok(); - let final_installed = - std::fs::read_to_string(root.join("vendor").join("composer").join("installed.json")).ok(); - - Ok(InProcessRunResult { - _working_dir: working_dir, - trace: executor.into_trace(), - final_lock, - final_installed, - exit_code, - }) -} - -fn run_fixture(ident: &str) { - let filename = format!("{}.test", ident.replace('_', "-")); - let path = fixtures_dir().join(&filename); - let parsed = parse_test_file(&path) - .unwrap_or_else(|e| panic!("failed to parse {}: {:#}", path.display(), e)); - - let runtime = tokio::runtime::Builder::new_current_thread() - .enable_all() - .build() - .expect("failed to build tokio runtime"); - let result = runtime - .block_on(run_fixture_in_process(&parsed)) - .unwrap_or_else(|e| panic!("failed to run {}: {:#}", path.display(), e)); - - let expected_exit = parsed.expect_exit_code.unwrap_or(0); - assert_eq!( - result.exit_code, - expected_exit, - "exit code mismatch for {}\n--- trace ---\n{}", - path.display(), - result.trace.join("\n"), - ); - - // EXPECT (the trace) is the load-bearing assertion in Composer's - // PHPUnit harness — every line of the operation log must match - // byte-for-byte against `(string) $operation` after `strip_tags`. - let expected_trace = parsed.expect.trim(); - let actual_trace = result.trace.join("\n"); - assert_eq!( - actual_trace.trim(), - expected_trace, - "EXPECT trace mismatch for {}\n--- expected ---\n{}\n--- actual ---\n{}\n--- final lock ---\n{}\n--- final installed ---\n{}", - path.display(), - expected_trace, - actual_trace, - result.final_lock.as_deref().unwrap_or("(absent)"), - result.final_installed.as_deref().unwrap_or("(absent)"), - ); -} - -// ──────────────────────────────────────────────────────────────────────────── -// In-process fixtures -// -// Step F will migrate every fixture from `installer.rs` to this harness. -// For now this file holds just the proof-of-concept: `suggest_replaced`, -// the original CI failure (the spawn runner can't reach Packagist for -// `b/b`, even though `c/c` replaces it). -// ──────────────────────────────────────────────────────────────────────────── - -#[test] -fn suggest_replaced_in_process() { - run_fixture("suggest_replaced"); -} -- cgit v1.3.1