diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-12-23 13:52:15 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-12-23 13:52:15 +0100 |
| commit | 00b2685b9ceecbeb5a5ea1cb7bd1ff2772e941de (patch) | |
| tree | e1c65ad61d57264be5c8624d5ffd0c4bcdc94b5d /test | |
| parent | 8e3e03229e10cba8fe6ad7aa67d48c939a1c458a (diff) | |
| parent | 9d8d675e0e739504978642f132ec3f68d6690892 (diff) | |
| download | youtube-dl-00b2685b9ceecbeb5a5ea1cb7bd1ff2772e941de.tar.xz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_download.py | 2 | ||||
| -rw-r--r-- | test/test_subtitles.py | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/test/test_download.py b/test/test_download.py index f242b3528..d0be8d27c 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -90,7 +90,7 @@ def generator(test_case): def _hook(status): if status['status'] == 'finished': finished_hook_called.add(status['filename']) - ydl.add_downloader_progress_hook(_hook) + ydl.add_progress_hook(_hook) def get_tc_filename(tc): return tc.get('file') or ydl.prepare_filename(tc.get('info_dict', {})) diff --git a/test/test_subtitles.py b/test/test_subtitles.py index 23a653124..263b5ac69 100644 --- a/test/test_subtitles.py +++ b/test/test_subtitles.py @@ -36,10 +36,6 @@ class TestYoutubeSubtitles(BaseTestSubtitles): url = 'QRS8MkLhQmM' IE = YoutubeIE - def getSubtitles(self): - info_dict = self.getInfoDict() - return info_dict[0]['subtitles'] - def test_youtube_no_writesubtitles(self): self.DL.params['writesubtitles'] = False subtitles = self.getSubtitles() |