1
0
mirror of https://github.com/kkroening/ffmpeg-python.git synced 2025-04-06 04:15:44 +08:00

Fix tests

This commit is contained in:
Karl Kroening 2018-05-20 01:36:46 -07:00
parent 9a487e8603
commit 6a2d3381b7

@ -329,11 +329,11 @@ def test__run__capture_out(mocker, capture_stdout, capture_stderr):
stream = _get_simple_example() stream = _get_simple_example()
out, err = ffmpeg.run(stream, capture_stdout=capture_stdout, capture_stderr=capture_stderr) out, err = ffmpeg.run(stream, capture_stdout=capture_stdout, capture_stderr=capture_stderr)
if capture_stdout: if capture_stdout:
assert out == 'test\n' assert out == 'test\n'.encode()
else: else:
assert out is None assert out is None
if capture_stderr: if capture_stderr:
assert err == '' assert err == ''.encode()
else: else:
assert err is None assert err is None
@ -341,8 +341,8 @@ def test__run__capture_out(mocker, capture_stdout, capture_stderr):
def test__run__input_output(mocker): def test__run__input_output(mocker):
mocker.patch.object(ffmpeg._run, 'compile', return_value=['cat']) mocker.patch.object(ffmpeg._run, 'compile', return_value=['cat'])
stream = _get_simple_example() stream = _get_simple_example()
out, err = ffmpeg.run(stream, input='test', capture_stdout=True) out, err = ffmpeg.run(stream, input='test'.encode(), capture_stdout=True)
assert out == 'test' assert out == 'test'.encode()
assert err is None assert err is None
@ -357,11 +357,11 @@ def test__run__error(mocker, capture_stdout, capture_stderr):
out = excinfo.value.stdout out = excinfo.value.stdout
err = excinfo.value.stderr err = excinfo.value.stderr
if capture_stdout: if capture_stdout:
assert out == '' assert out == ''.encode()
else: else:
assert out is None assert out is None
if capture_stderr: if capture_stderr:
assert err.startswith('ffmpeg version') assert err.decode().startswith('ffmpeg version')
else: else:
assert err is None assert err is None