diff options
Diffstat (limited to 'crates/shirabe/tests')
| -rw-r--r-- | crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe/tests/plugin/e2e_extension_installer_test.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs b/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs index e3f5c9a5..90df0624 100644 --- a/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs +++ b/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs @@ -140,7 +140,7 @@ fn ensure_php_binary() -> bool { { return true; } - let path = std::env::var_os("PATH").unwrap_or_default(); + let path = shirabe_php_shim::getenv("PATH").unwrap_or_default(); for dir in std::env::split_paths(&path) { let candidate = dir.join("php"); if candidate.is_file() { diff --git a/crates/shirabe/tests/plugin/e2e_extension_installer_test.rs b/crates/shirabe/tests/plugin/e2e_extension_installer_test.rs index 9a95888c..71b40ff1 100644 --- a/crates/shirabe/tests/plugin/e2e_extension_installer_test.rs +++ b/crates/shirabe/tests/plugin/e2e_extension_installer_test.rs @@ -8,7 +8,7 @@ //! any of these is missing. Test runs themselves are offline: the fixture project resolves //! everything from local repositories. -use crate::plugin_installer_test::{lock_php_worker, php_runtime_available}; +use crate::php_worker::{lock_php_worker, php_runtime_available}; use indexmap::IndexMap; use std::path::{Path, PathBuf}; use tempfile::TempDir; @@ -21,9 +21,9 @@ fn fixture_dir() -> PathBuf { /// the worker). Absent checkout means the oracle cannot run; the test returns early, /// following the convention of the non-mock tests in `shirabe-php-rpc`. pub(crate) fn upstream_composer_bin() -> Option<PathBuf> { - let root = match std::env::var("SHIRABE_COMPOSER_PHP_DIR") { - Ok(dir) => PathBuf::from(dir), - Err(_) => Path::new(env!("CARGO_MANIFEST_DIR")).join("../../composer"), + let root = match shirabe_php_shim::getenv("SHIRABE_COMPOSER_PHP_DIR") { + Some(dir) => PathBuf::from(dir), + None => Path::new(env!("CARGO_MANIFEST_DIR")).join("../../composer"), }; let bin = root.join("bin/composer"); if bin.is_file() && root.join("vendor/autoload.php").is_file() { |