diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-02-15 18:52:07 +0100 | 
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-02-16 21:51:07 +0100 | 
| commit | 65469a7f8b0ba50bd3c8918707e35125962aa2cd (patch) | |
| tree | 96c4f19d4fb9c0962f0a695865f8fe8855f42b79 /test | |
| parent | 6b597516c12c7fd81e832f3ec05dd0dca6089823 (diff) | |
[vimeo] Convert to new subtitles system
Removed some tests, the behaviour should be checked in a test for the YoutubeDL class
Diffstat (limited to 'test')
| -rw-r--r-- | test/parameters.json | 2 | ||||
| -rw-r--r-- | test/test_subtitles.py | 17 | 
2 files changed, 1 insertions, 18 deletions
diff --git a/test/parameters.json b/test/parameters.json index af77b89b4..cbff9bd16 100644 --- a/test/parameters.json +++ b/test/parameters.json @@ -28,7 +28,7 @@      "retries": 10,       "simulate": false,       "subtitleslang": null,  -    "subtitlesformat": "srt", +    "subtitlesformat": "best",      "test": true,       "updatetime": true,       "usenetrc": false,  diff --git a/test/test_subtitles.py b/test/test_subtitles.py index fbc9eaf4d..3f2d61d36 100644 --- a/test/test_subtitles.py +++ b/test/test_subtitles.py @@ -240,10 +240,6 @@ class TestVimeoSubtitles(BaseTestSubtitles):      url = 'http://vimeo.com/76979871'      IE = VimeoIE -    def test_no_writesubtitles(self): -        subtitles = self.getSubtitles() -        self.assertEqual(subtitles, None) -      def test_subtitles(self):          self.DL.params['writesubtitles'] = True          subtitles = self.getSubtitles() @@ -261,19 +257,6 @@ class TestVimeoSubtitles(BaseTestSubtitles):          subtitles = self.getSubtitles()          self.assertEqual(set(subtitles.keys()), set(['de', 'en', 'es', 'fr'])) -    def test_list_subtitles(self): -        self.DL.expect_warning('Automatic Captions not supported by this server') -        self.DL.params['listsubtitles'] = True -        info_dict = self.getInfoDict() -        self.assertEqual(info_dict, None) - -    def test_automatic_captions(self): -        self.DL.expect_warning('Automatic Captions not supported by this server') -        self.DL.params['writeautomaticsub'] = True -        self.DL.params['subtitleslang'] = ['en'] -        subtitles = self.getSubtitles() -        self.assertTrue(len(subtitles.keys()) == 0) -      def test_nosubtitles(self):          self.DL.expect_warning('video doesn\'t have subtitles')          self.url = 'http://vimeo.com/56015672'  | 
