diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-07-20 01:33:14 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-07-20 01:33:14 +0900 |
| commit | 5fac1bba14ad5b9e4d2abfa3ca299f88cc1e62bf (patch) | |
| tree | 895d808df734f16b6201e610739a67dfa317d11d /crates/shirabe/tests/repository/vcs/github_driver_test.rs | |
| parent | 9a2cee2532e5d28d5cea5726f35ab3c7046e7c0d (diff) | |
| download | php-shirabe-5fac1bba14ad5b9e4d2abfa3ca299f88cc1e62bf.tar.gz php-shirabe-5fac1bba14ad5b9e4d2abfa3ca299f88cc1e62bf.tar.zst php-shirabe-5fac1bba14ad5b9e4d2abfa3ca299f88cc1e62bf.zip | |
fix(process-executor): un-ignore 11 tests by implementing execute_async mock support
ProcessExecutor::execute_async's mock branch was an unimplemented
todo!(), blocking every test whose code path calls it (feature-branch
git diffing, system-unzip/7z fallback extraction). Implement it by:
- Adding Process::__mock (mirroring the existing ZipArchive::__mock
pattern) so execute_async can resolve with a fabricated, already-
terminated Process instead of spawning a real subprocess.
- Extracting the sync mock's expectation-matching logic into a shared
ProcessExecutor::mock_match, wrapping the mock state in a RefCell so
it works from execute_async's &self/&mut self receivers.
- Setting error_output/capture_output from the mock branch, matching
PHP's ProcessExecutorMock::executeAsync sharing doExecute with the
sync path; execute_async now takes &mut self for this (safe, since
the borrow only needs to live through the synchronous setup, not
across the .await).
- Turning a strict-mode expectation mismatch from a panic!() into a
shirabe_php_shim::RuntimeException Err, mirroring PHPUnit's
AssertionFailedError extending \RuntimeException: PHP call sites
that catch (\RuntimeException $e) around a mocked git/hg/svn call
(e.g. Git::get_mirror_default_branch, GitDriver::supports) treat a
mismatch as an ordinary recoverable failure, and now so does the
port. The RefMut is dropped before firing an expectation's optional
callback so a re-entrant callback doesn't panic on double-borrow.
Also fixes two real bugs found while porting test_private_repository_
no_interaction: GitHub::authorize_oauth and GitLab::authorize_oauth
checked their domains config via PhpMixed::as_array(), which only
matches the Array (map) variant, but github-domains/gitlab-domains
default to PhpMixed::List, so the check always returned false and OAuth
token lookup was silently skipped. Use the in_array shim instead,
matching PHP's in_array() semantics. Also fix Git::run_command's
"capture credentials from git remote -v" call, which used the panic-
swallowing execute_args wrapper instead of a fallible execute(), so a
mock mismatch there couldn't reach get_mirror_default_branch's catch.
Un-ignores:
- zip_downloader_test::test_system_unzip_only_{good,failed}
- zip_downloader_test::test_non_windows_fallback_{good,failed}
- event_dispatcher_test::test_dispatcher_outputs_error_on_failed_command
- root_package_loader_test::test_feature_branch_pretty_version
- version_guesser_test::test_guess_version_reads_and_respects_non_feature_branches_configuration_for_arbitrary_naming{,_regex}
- version_guesser_test::test_remote_branches_are_selected
- github_driver_test::test_private_repository_no_interaction (also
adds the missing #[serial], since it seeds the shared Git::VERSION
static that vcs_repository_test::test_load_versions depends on for
real)
- init_command_test::test_get_git_config, made deterministic by
pointing HOME at a throwaway dir with its own .gitconfig instead of
depending on the host's global git config
Deduplicates the GitVersionGuard/RestoreEnv test-drop-guard idioms into
tests/common/test_case.rs instead of reimplementing them per file.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/tests/repository/vcs/github_driver_test.rs')
| -rw-r--r-- | crates/shirabe/tests/repository/vcs/github_driver_test.rs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/crates/shirabe/tests/repository/vcs/github_driver_test.rs b/crates/shirabe/tests/repository/vcs/github_driver_test.rs index 5b8367c7..8b30a796 100644 --- a/crates/shirabe/tests/repository/vcs/github_driver_test.rs +++ b/crates/shirabe/tests/repository/vcs/github_driver_test.rs @@ -5,12 +5,15 @@ use crate::io_stub::IOStub; use crate::process_executor_mock::{ ProcessExecutorMockGuard, cmd, cmd_full, get_process_executor_mock, }; +use crate::test_case::GitVersionGuard; use indexmap::IndexMap; +use serial_test::serial; use shirabe::config::Config; use shirabe::config::ConfigSourceInterface; use shirabe::io::IOInterface; use shirabe::io::null_io::NullIO; use shirabe::repository::vcs::GitHubDriver; +use shirabe::util::Git as GitUtil; use shirabe::util::filesystem::Filesystem; use shirabe::util::http_downloader::HttpDownloaderMockHandler; use shirabe::util::process_executor::{MockHandler, ProcessExecutor}; @@ -681,9 +684,17 @@ fn test_public_repository_archived() { assert_eq!(Some(true), data.get("abandoned").and_then(|v| v.as_bool())); } +// GitDriver::initialize calls GitUtil::cleanEnv, which calls GitUtil::getVersion; PHP's +// `GitUtil::$version` is a class-level static that persists for the whole PHPUnit run, so by the +// time this test runs it has already been populated (as a side effect of some earlier-run test +// invoking the real `git --version`) and the mock expectation list below never needs to include it. +// Rust test execution order isn't guaranteed the same way, so the cache is seeded explicitly here. #[test] -#[ignore = "GitDriver clone-fallback path runs an unexpected `git --version` (Git::get_version) not in the PHP mock expectation list; needs the version static seeded and the Rust sync_mirror command sequence to match"] +#[serial] fn test_private_repository_no_interaction() { + GitUtil::__set_version(Some("2.52.0".to_string())); + let _git_guard = GitVersionGuard; + let SetUp { home, config } = set_up(); let _tear_down = TearDown::new(home.path().to_path_buf()); |
