mirror/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-01-15 13:30:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Normalize crlf in tests

Browse Source
This commit is contained in:
Anthony Sottile
2019-12-23 18:27:30 -08:00
parent 517c3145f4
commit 4941ed58d5
7 changed files with 46 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
testing/util.py
View File

@@ -2,6 +2,7 @@ from __future__ import unicode_literals
import contextlib
import os.path
import subprocess
import sys
import pytest
@@ -24,9 +25,11 @@ def cmd_output_mocked_pre_commit_home(*args, **kwargs):
# keyword-only argument
tempdir_factory = kwargs.pop('tempdir_factory')
pre_commit_home = kwargs.pop('pre_commit_home', tempdir_factory.get())
kwargs.setdefault('stderr', subprocess.STDOUT)
# Don't want to write to the home directory
env = dict(kwargs.pop('env', os.environ), PRE_COMMIT_HOME=pre_commit_home)
return cmd_output(*args, env=env, **kwargs)
ret, out, _ = cmd_output(*args, env=env, **kwargs)
return ret, out.replace('\r\n', '\n'), None
skipif_cant_run_docker = pytest.mark.skipif(
@@ -137,8 +140,10 @@ def cwd(path):
def git_commit(*args, **kwargs):
fn = kwargs.pop('fn', cmd_output)
msg = kwargs.pop('msg', 'commit!')
kwargs.setdefault('stderr', subprocess.STDOUT)
cmd = ('git', 'commit', '--allow-empty', '--no-gpg-sign', '-a') + args
if msg is not None: # allow skipping `-m` with `msg=None`
cmd += ('-m', msg)
return fn(*cmd, **kwargs)
ret, out, _ = fn(*cmd, **kwargs)
return ret, out.replace('\r\n', '\n')