Skip to content

Add input/output support in run command; update docs #85

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 6 commits into from
May 20, 2018
Merged

Add input/output support in run command; update docs #85

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ac57e2d
Add input/output support in `run` command; update docs
kkroening May 20, 2018
8711e16
Merge remote-tracking branch 'origin/master' into inout
kkroening May 20, 2018
4558c25
Update tox.ini
kkroening May 20, 2018
940b05f
Fix ffprobe exception test
kkroening May 20, 2018
9a487e8
Fix exception params
kkroening May 20, 2018
6a2d338
Fix tests
kkroening May 20, 2018
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
Next Next commit
Fix ffprobe exception test
  • Loading branch information
@kkroening
kkroening committed May 20, 2018
commit 940b05f3fcf46f60eb02ebdabb58289db033dfae
4 changes: 2 additions & 2 deletions ffmpeg/tests/test_ffmpeg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ def test_ffprobe():


def test_ffprobe_exception():
with pytest.raises(ffmpeg.ProbeException) as excinfo:
with pytest.raises(ffmpeg.Error) as excinfo:
ffmpeg.probe(BOGUS_INPUT_FILE)
assert str(excinfo.value) == 'ffprobe error'
assert b'No such file or directory' in excinfo.value.stderr_output
assert 'No such file or directory'.encode() in excinfo.value.stderr