summaryrefslogtreecommitdiffstats
path: root/testing/util.py
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2020-06-14 09:11:24 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2020-06-14 09:11:24 +0000
commit1312af87e5908ac252c0659a60216e96ec5b23bd (patch)
tree7621ad7267ffb9ecd8339983fd83150abc99082f /testing/util.py
parentReleasing debian version 2.3.0-1. (diff)
downloadpre-commit-1312af87e5908ac252c0659a60216e96ec5b23bd.tar.xz
pre-commit-1312af87e5908ac252c0659a60216e96ec5b23bd.zip
Merging upstream version 2.5.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/util.py')
-rw-r--r--testing/util.py20
1 files changed, 4 insertions, 16 deletions
diff --git a/testing/util.py b/testing/util.py
index 439bee7..bfe1421 100644
--- a/testing/util.py
+++ b/testing/util.py
@@ -45,20 +45,6 @@ xfailif_windows_no_ruby = pytest.mark.xfail(
xfailif_windows = pytest.mark.xfail(os.name == 'nt', reason='windows')
-def supports_venv(): # pragma: no cover (platform specific)
- try:
- __import__('ensurepip')
- __import__('venv')
- return True
- except ImportError:
- return False
-
-
-xfailif_no_venv = pytest.mark.xfail(
- not supports_venv(), reason='Does not support venv module',
-)
-
-
def run_opts(
all_files=False,
files=(),
@@ -103,10 +89,12 @@ def cwd(path):
os.chdir(original_cwd)
-def git_commit(*args, fn=cmd_output, msg='commit!', **kwargs):
+def git_commit(*args, fn=cmd_output, msg='commit!', all_files=True, **kwargs):
kwargs.setdefault('stderr', subprocess.STDOUT)
- cmd = ('git', 'commit', '--allow-empty', '--no-gpg-sign', '-a') + args
+ cmd = ('git', 'commit', '--allow-empty', '--no-gpg-sign', *args)
+ if all_files: # allow skipping `-a` with `all_files=False`
+ cmd += ('-a',)
if msg is not None: # allow skipping `-m` with `msg=None`
cmd += ('-m', msg)
ret, out, _ = fn(*cmd, **kwargs)