diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-03-08 17:48:51 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-03-08 17:49:10 +0000 |
commit | 84c011ae6133fb007046d8eb66c01d0de80b3500 (patch) | |
tree | 60b2be37885c99f0bf69434223b01cc5a2b92203 /tests/commands/hook_impl_test.py | |
parent | Releasing debian version 2.10.1-1. (diff) | |
download | pre-commit-84c011ae6133fb007046d8eb66c01d0de80b3500.tar.xz pre-commit-84c011ae6133fb007046d8eb66c01d0de80b3500.zip |
Merging upstream version 2.11.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/commands/hook_impl_test.py')
-rw-r--r-- | tests/commands/hook_impl_test.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/commands/hook_impl_test.py b/tests/commands/hook_impl_test.py index 2fc0146..c38b9ca 100644 --- a/tests/commands/hook_impl_test.py +++ b/tests/commands/hook_impl_test.py @@ -97,6 +97,7 @@ def test_run_legacy_recursive(tmpdir): ('pre-push', ['branch_name', 'remote_name']), ('commit-msg', ['.git/COMMIT_EDITMSG']), ('post-commit', []), + ('post-merge', ['1']), ('post-checkout', ['old_head', 'new_head', '1']), # multiple choices for commit-editmsg ('prepare-commit-msg', ['.git/COMMIT_EDITMSG']), @@ -157,6 +158,14 @@ def test_run_ns_post_commit(): assert ns.color is True +def test_run_ns_post_merge(): + ns = hook_impl._run_ns('post-merge', True, ('1',), b'') + assert ns is not None + assert ns.hook_stage == 'post-merge' + assert ns.color is True + assert ns.is_squash_merge == '1' + + def test_run_ns_post_checkout(): ns = hook_impl._run_ns('post-checkout', True, ('a', 'b', 'c'), b'') assert ns is not None |