Improve test_merge_conflict via new prompt_yes_or_no - #147
JohanMabille merged 3 commits into
Conversation
Sorry, something went wrong.
| async function delayThenStdin(): Promise<void> { | ||
| const chars = input! + '\x04'; // EOT | ||
| let chars = input!; | ||
| if (!chars.endsWith('\n')) { |
There was a problem hiding this comment.
This is an improvement in the wasm handling following on from cockle now implementing line buffered stdin.
Sorry, something went wrong.
| assert git_lines == [] | ||
|
|
||
|
|
||
| def test_repo_init_with_commit(repo_init_with_commit, git2cpp_path, tmp_path): |
There was a problem hiding this comment.
New test to check that repo_init_with_commit is correct. I thought at one point that is was causing problems but it is fine. We may as well keep the test.
Sorry, something went wrong.
There was a problem hiding this comment.
Let's keep it, it cannot hurt.
Sorry, something went wrong.
Codecov Report✅ All modified and coverable lines are covered by tests. @@ Coverage Diff @@
## main #147 +/- ##
==========================================
+ Coverage 88.22% 88.30% +0.08%
==========================================
Files 61 61
Lines 3065 2737 -328
Branches 330 332 +2
==========================================
- Hits 2704 2417 -287
+ Misses 361 320 -41 ☔ View full report in Codecov by Harness.
|
Sorry, something went wrong.
|
This is good to go now. 3 sets of CI runs without a flaky test, and after a few tweaks the wasm CI also passes in https://github.com/QuantStack/git2cpp/actions/runs/25000127283. |
Sorry, something went wrong.
| assert git_lines == [] | ||
|
|
||
|
|
||
| def test_repo_init_with_commit(repo_init_with_commit, git2cpp_path, tmp_path): |
There was a problem hiding this comment.
Let's keep it, it cannot hurt.
Sorry, something went wrong.
This PR implements a new helper function prompt_yes_or_no which prompts the user for a yes or no answer and uses a default if the user just presses return, and repeats the prompt if the user's response is not clear. This is used by git2cpp merge --abort for the prompt to continue or not.
As part of this I have refactored test_merge_conflict to explicitly test all of the possibilities, and I believe I have made the test less flaky than it used to be.