diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-03-19 10:19:07 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-03-19 10:19:07 +0000 |
| commit | 48bb2fbcf5dc4b7c775f9745dcd2a02588e37300 (patch) | |
| tree | 610ea82daf36c55d57749047efe9baf484b99f0b /testing/util.py | |
| parent | Releasing debian version 3.1.1-1. (diff) | |
| download | pre-commit-48bb2fbcf5dc4b7c775f9745dcd2a02588e37300.tar.xz pre-commit-48bb2fbcf5dc4b7c775f9745dcd2a02588e37300.zip | |
Merging upstream version 3.2.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/util.py')
| -rw-r--r-- | testing/util.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/testing/util.py b/testing/util.py index 7c68d0e..08d52cb 100644 --- a/testing/util.py +++ b/testing/util.py @@ -3,6 +3,7 @@ from __future__ import annotations import contextlib import os.path import subprocess +import sys import pytest @@ -30,7 +31,7 @@ def cmd_output_mocked_pre_commit_home( return ret, out.replace('\r\n', '\n'), None -xfailif_windows = pytest.mark.xfail(os.name == 'nt', reason='windows') +xfailif_windows = pytest.mark.xfail(sys.platform == 'win32', reason='windows') def run_opts( @@ -43,9 +44,11 @@ def run_opts( local_branch='', from_ref='', to_ref='', + pre_rebase_upstream='', + pre_rebase_branch='', remote_name='', remote_url='', - hook_stage='commit', + hook_stage='pre-commit', show_diff_on_failure=False, commit_msg_filename='', prepare_commit_message_source='', @@ -66,6 +69,8 @@ def run_opts( local_branch=local_branch, from_ref=from_ref, to_ref=to_ref, + pre_rebase_upstream=pre_rebase_upstream, + pre_rebase_branch=pre_rebase_branch, remote_name=remote_name, remote_url=remote_url, hook_stage=hook_stage, |