blackteay/ffmpeg-python
1
0
Fork 0
mirror of https://github.com/kkroening/ffmpeg-python.git synced 2025-04-05 04:22:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #493 from kkroening/revert-430-master

Browse Source 
Revert "Implemented cwd parameter"
This commit is contained in:
Davide Depau 2021-02-16 22:55:10 +01:00 committed by GitHub
commit cc1f664fb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffmpeg/_run.py
View File

@ -199,7 +199,6 @@ def run_async(
pipe_stderr=False, pipe_stderr=False,
quiet=False, quiet=False,
overwrite_output=False, overwrite_output=False,
cwd=None
): ):
"""Asynchronously invoke ffmpeg for the supplied node graph. """Asynchronously invoke ffmpeg for the supplied node graph.
@ -286,8 +285,7 @@ def run_async(
stderr_stream = subprocess.STDOUT stderr_stream = subprocess.STDOUT
stdout_stream = subprocess.DEVNULL stdout_stream = subprocess.DEVNULL
return subprocess.Popen( return subprocess.Popen(
args, stdin=stdin_stream, stdout=stdout_stream, stderr=stderr_stream, args, stdin=stdin_stream, stdout=stdout_stream, stderr=stderr_stream
cwd=cwd
) )
@ -300,7 +298,6 @@ def run(
input=None, input=None,
quiet=False, quiet=False,
overwrite_output=False, overwrite_output=False,
cwd=None
): ):
"""Invoke ffmpeg for the supplied node graph. """Invoke ffmpeg for the supplied node graph.
@ -324,7 +321,6 @@ def run(
pipe_stderr=capture_stderr, pipe_stderr=capture_stderr,
quiet=quiet, quiet=quiet,
overwrite_output=overwrite_output, overwrite_output=overwrite_output,
cwd=cwd
) )
out, err = process.communicate(input) out, err = process.communicate(input)
retcode = process.poll() retcode = process.poll()

9
ffmpeg/tests/test_ffmpeg.py
View File

@ -441,14 +441,12 @@ def test__compile():
@pytest.mark.parametrize('pipe_stdin', [True, False]) @pytest.mark.parametrize('pipe_stdin', [True, False])
@pytest.mark.parametrize('pipe_stdout', [True, False]) @pytest.mark.parametrize('pipe_stdout', [True, False])
@pytest.mark.parametrize('pipe_stderr', [True, False]) @pytest.mark.parametrize('pipe_stderr', [True, False])
@pytest.mark.parametrize('cwd', [None, '/tmp']) def test__run_async(mocker, pipe_stdin, pipe_stdout, pipe_stderr):
def test__run_async(mocker, pipe_stdin, pipe_stdout, pipe_stderr, cwd):
process__mock = mock.Mock() process__mock = mock.Mock()
popen__mock = mocker.patch.object(subprocess, 'Popen', return_value=process__mock) popen__mock = mocker.patch.object(subprocess, 'Popen', return_value=process__mock)
stream = _get_simple_example() stream = _get_simple_example()
process = ffmpeg.run_async( process = ffmpeg.run_async(
stream, pipe_stdin=pipe_stdin, pipe_stdout=pipe_stdout, stream, pipe_stdin=pipe_stdin, pipe_stdout=pipe_stdout, pipe_stderr=pipe_stderr
pipe_stderr=pipe_stderr, cwd=cwd
) )
assert process is process__mock assert process is process__mock
@ -458,8 +456,7 @@ def test__run_async(mocker, pipe_stdin, pipe_stdout, pipe_stderr, cwd):
(args,), kwargs = popen__mock.call_args (args,), kwargs = popen__mock.call_args
assert args == ffmpeg.compile(stream) assert args == ffmpeg.compile(stream)
assert kwargs == dict( assert kwargs == dict(
stdin=expected_stdin, stdout=expected_stdout, stderr=expected_stderr, stdin=expected_stdin, stdout=expected_stdout, stderr=expected_stderr
cwd=cwd
) )