Merging upstream version 2.21.0.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
08d9b01ff9
commit
54d13e9018
48 changed files with 534 additions and 210 deletions
tests
|
@ -18,11 +18,10 @@ from pre_commit.util import tmpdir
|
|||
|
||||
|
||||
def test_CalledProcessError_str():
|
||||
error = CalledProcessError(1, ('exe',), 0, b'output', b'errors')
|
||||
error = CalledProcessError(1, ('exe',), b'output', b'errors')
|
||||
assert str(error) == (
|
||||
"command: ('exe',)\n"
|
||||
'return code: 1\n'
|
||||
'expected return code: 0\n'
|
||||
'stdout:\n'
|
||||
' output\n'
|
||||
'stderr:\n'
|
||||
|
@ -31,11 +30,10 @@ def test_CalledProcessError_str():
|
|||
|
||||
|
||||
def test_CalledProcessError_str_nooutput():
|
||||
error = CalledProcessError(1, ('exe',), 0, b'', b'')
|
||||
error = CalledProcessError(1, ('exe',), b'', b'')
|
||||
assert str(error) == (
|
||||
"command: ('exe',)\n"
|
||||
'return code: 1\n'
|
||||
'expected return code: 0\n'
|
||||
'stdout: (none)\n'
|
||||
'stderr: (none)'
|
||||
)
|
||||
|
@ -83,14 +81,14 @@ def test_tmpdir():
|
|||
|
||||
|
||||
def test_cmd_output_exe_not_found():
|
||||
ret, out, _ = cmd_output('dne', retcode=None)
|
||||
ret, out, _ = cmd_output('dne', check=False)
|
||||
assert ret == 1
|
||||
assert out == 'Executable `dne` not found'
|
||||
|
||||
|
||||
@pytest.mark.parametrize('fn', (cmd_output_b, cmd_output_p))
|
||||
def test_cmd_output_exe_not_found_bytes(fn):
|
||||
ret, out, _ = fn('dne', retcode=None, stderr=subprocess.STDOUT)
|
||||
ret, out, _ = fn('dne', check=False, stderr=subprocess.STDOUT)
|
||||
assert ret == 1
|
||||
assert out == b'Executable `dne` not found'
|
||||
|
||||
|
@ -101,7 +99,7 @@ def test_cmd_output_no_shebang(tmpdir, fn):
|
|||
make_executable(f)
|
||||
|
||||
# previously this raised `OSError` -- the output is platform specific
|
||||
ret, out, _ = fn(str(f), retcode=None, stderr=subprocess.STDOUT)
|
||||
ret, out, _ = fn(str(f), check=False, stderr=subprocess.STDOUT)
|
||||
assert ret == 1
|
||||
assert isinstance(out, bytes)
|
||||
assert out.endswith(b'\n')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue