Skip to content

Implemented cwd parameter #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 15, 2021
Merged

Implemented cwd parameter #430

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96fb3ff
Added parameter to set ffmpeg's working directory
Jacotsu Oct 7, 2020
b64f40a
Fixed typo in cwd parameter usage
Jacotsu Oct 7, 2020
17995f5
Updated test to check the new cwd parameter
Jacotsu Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Updated test to check the new cwd parameter
  • Loading branch information
@Jacotsu
Jacotsu committed Oct 9, 2020
commit 17995f5ff3ab77f3b6736783c4b180283ec0fc15
9 changes: 6 additions & 3 deletions ffmpeg/tests/test_ffmpeg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,12 +441,14 @@ def test__compile():
@pytest.mark.parametrize('pipe_stdin', [True, False])
@pytest.mark.parametrize('pipe_stdout', [True, False])
@pytest.mark.parametrize('pipe_stderr', [True, False])
def test__run_async(mocker, pipe_stdin, pipe_stdout, pipe_stderr):
@pytest.mark.parametrize('cwd', [None, '/tmp'])
def test__run_async(mocker, pipe_stdin, pipe_stdout, pipe_stderr, cwd):
process__mock = mock.Mock()
popen__mock = mocker.patch.object(subprocess, 'Popen', return_value=process__mock)
stream = _get_simple_example()
process = ffmpeg.run_async(
stream, pipe_stdin=pipe_stdin, pipe_stdout=pipe_stdout, pipe_stderr=pipe_stderr
stream, pipe_stdin=pipe_stdin, pipe_stdout=pipe_stdout,
pipe_stderr=pipe_stderr, cwd=cwd
)
assert process is process__mock

Expand All @@ -456,7 +458,8 @@ def test__run_async(mocker, pipe_stdin, pipe_stdout, pipe_stderr):
(args,), kwargs = popen__mock.call_args
assert args == ffmpeg.compile(stream)
assert kwargs == dict(
stdin=expected_stdin, stdout=expected_stdout, stderr=expected_stderr
stdin=expected_stdin, stdout=expected_stdout, stderr=expected_stderr,
cwd=cwd
)


Expand Down