hg: read rejects file contents in-memory (Bug 2031725) #1089 (lando@main)
| Warnings |
|
|---|---|
| Blockers |
|
| Branches | rejects-memory -> main |
| Repo | lando@main (git) (git://github.com/cgsheeh/lando.git) |
| Author | cgsheeh |
| State | closed |
| Commit Title | hg: read rejects file contents in-memory (Bug 2031725) |
| Commit Body | Use of the hard-coded `/tmp/rejects_path` directory to store `.rej` file contents causes intermittent test failures during parallelized test runs. Tests will attempt to clear the directory during `clean_repo` and the later read file contents in `process_merge_conflicts`, causing several different intermittent failures from this single issue. Change `HgSCM` to read the rejects content into an in-memory instance variable, which is initialized empty and cleared at the same time the previous implementation would `rmdir` the directory. Move logic to an instance method and add a unit test for the parsing logic. Expand tests to ensure parsing cannot fail on invalid UTF-8, and that the in-memory rejects are properly parsed on `PatchConflict`. |
Landings
Successfully landed
Landing requested on , by cosheehan@mozilla.com.
Landing Job: 36354