From 1e63419a9385b5382f4a6c1814401b371f382ca0 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Sun, 11 Mar 2018 21:33:32 -0700 Subject: [PATCH] Test bad stream selectors --- ffmpeg/nodes.py | 10 +++++----- ffmpeg/tests/test_ffmpeg.py | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ffmpeg/nodes.py b/ffmpeg/nodes.py index c809cb9..f59b3eb 100644 --- a/ffmpeg/nodes.py +++ b/ffmpeg/nodes.py @@ -52,15 +52,15 @@ class Stream(object): Process the audio and video portions of a stream independently:: - in = ffmpeg.input('in.mp4') - audio = in['a'].filter_("aecho", 0.8, 0.9, 1000, 0.3) - video = in['v'].hflip() - ffmpeg.output(audio, video, 'out.mp4') + input = ffmpeg.input('in.mp4') + audio = input['a'].filter_("aecho", 0.8, 0.9, 1000, 0.3) + video = input['v'].hflip() + out = ffmpeg.output(audio, video, 'out.mp4') """ if self.selector is not None: raise ValueError('Stream already has a selector: {}'.format(self)) elif not isinstance(index, basestring): - raise TypeError("Expected string index (e.g. 'v'); got {!r}".format(index)) + raise TypeError("Expected string index (e.g. 'a'); got {!r}".format(index)) return self.node.stream(label=self.label, selector=index) diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index 0457acf..2312552 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -175,6 +175,22 @@ def test_filter_with_selector(): ] +def test_filter_with_bad_selectors(): + input = ffmpeg.input(TEST_INPUT_FILE1) + + with pytest.raises(ValueError) as excinfo: + input['a']['a'] + assert str(excinfo.value).startswith('Stream already has a selector:') + + with pytest.raises(TypeError) as excinfo: + input[:'a'] + assert str(excinfo.value).startswith("Expected string index (e.g. 'a')") + + with pytest.raises(TypeError) as excinfo: + input[5] + assert str(excinfo.value).startswith("Expected string index (e.g. 'a')") + + def _get_complex_filter_asplit_example(): split = (ffmpeg .input(TEST_INPUT_FILE1)