diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_YoutubeDL.py | 75 | ||||
| -rw-r--r-- | test/test_playlists.py | 12 | ||||
| -rw-r--r-- | test/test_utils.py | 8 | 
3 files changed, 85 insertions, 10 deletions
| diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py index 5203a0273..01de10e31 100644 --- a/test/test_YoutubeDL.py +++ b/test/test_YoutubeDL.py @@ -8,6 +8,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))  from test.helper import FakeYDL  from youtube_dl import YoutubeDL +from youtube_dl.extractor import YoutubeIE  class YDL(FakeYDL): @@ -33,6 +34,8 @@ class TestFormatSelection(unittest.TestCase):              {u'ext': u'mp4',  u'height': 460},          ]          info_dict = {u'formats': formats, u'extractor': u'test'} +        yie = YoutubeIE(ydl) +        yie._sort_formats(info_dict['formats'])          ydl.process_ie_result(info_dict)          downloaded = ydl.downloaded_info_dicts[0]          self.assertEqual(downloaded[u'ext'], u'webm') @@ -45,28 +48,46 @@ class TestFormatSelection(unittest.TestCase):              {u'ext': u'mp4', u'height': 1080},          ]          info_dict[u'formats'] = formats +        yie = YoutubeIE(ydl) +        yie._sort_formats(info_dict['formats'])          ydl.process_ie_result(info_dict)          downloaded = ydl.downloaded_info_dicts[0]          self.assertEqual(downloaded[u'ext'], u'mp4') -        # No prefer_free_formats => keep original formats order +        # No prefer_free_formats => prefer mp4 and flv for greater compatibilty          ydl = YDL()          ydl.params['prefer_free_formats'] = False          formats = [              {u'ext': u'webm', u'height': 720}, +            {u'ext': u'mp4', u'height': 720},              {u'ext': u'flv', u'height': 720},          ]          info_dict[u'formats'] = formats +        yie = YoutubeIE(ydl) +        yie._sort_formats(info_dict['formats']) +        ydl.process_ie_result(info_dict) +        downloaded = ydl.downloaded_info_dicts[0] +        self.assertEqual(downloaded[u'ext'], u'mp4') + +        ydl = YDL() +        ydl.params['prefer_free_formats'] = False +        formats = [ +            {u'ext': u'flv', u'height': 720}, +            {u'ext': u'webm', u'height': 720}, +        ] +        info_dict[u'formats'] = formats +        yie = YoutubeIE(ydl) +        yie._sort_formats(info_dict['formats'])          ydl.process_ie_result(info_dict)          downloaded = ydl.downloaded_info_dicts[0]          self.assertEqual(downloaded[u'ext'], u'flv')      def test_format_limit(self):          formats = [ -            {u'format_id': u'meh', u'url': u'http://example.com/meh'}, -            {u'format_id': u'good', u'url': u'http://example.com/good'}, -            {u'format_id': u'great', u'url': u'http://example.com/great'}, -            {u'format_id': u'excellent', u'url': u'http://example.com/exc'}, +            {u'format_id': u'meh', u'url': u'http://example.com/meh', 'preference': 1}, +            {u'format_id': u'good', u'url': u'http://example.com/good', 'preference': 2}, +            {u'format_id': u'great', u'url': u'http://example.com/great', 'preference': 3}, +            {u'format_id': u'excellent', u'url': u'http://example.com/exc', 'preference': 4},          ]          info_dict = {              u'formats': formats, u'extractor': u'test', 'id': 'testvid'} @@ -97,10 +118,10 @@ class TestFormatSelection(unittest.TestCase):      def test_format_selection(self):          formats = [ -            {u'format_id': u'35', u'ext': u'mp4'}, -            {u'format_id': u'45', u'ext': u'webm'}, -            {u'format_id': u'47', u'ext': u'webm'}, -            {u'format_id': u'2', u'ext': u'flv'}, +            {u'format_id': u'35', u'ext': u'mp4', 'preference': 1}, +            {u'format_id': u'45', u'ext': u'webm', 'preference': 2}, +            {u'format_id': u'47', u'ext': u'webm', 'preference': 3}, +            {u'format_id': u'2', u'ext': u'flv', 'preference': 4},          ]          info_dict = {u'formats': formats, u'extractor': u'test'} @@ -129,6 +150,42 @@ class TestFormatSelection(unittest.TestCase):          downloaded = ydl.downloaded_info_dicts[0]          self.assertEqual(downloaded['format_id'], u'35') +    def test_youtube_format_selection(self): +        order = [ +            '38', '37', '46', '22', '45', '35', '44', '18', '34', '43', '6', '5', '36', '17', '13', +            # Apple HTTP Live Streaming +            '96', '95', '94', '93', '92', '132', '151', +            # 3D +            '85', '84', '102', '83', '101', '82', '100', +            # Dash video +            '138', '137', '248', '136', '247', '135', '246', +            '245', '244', '134', '243', '133', '242', '160', +            # Dash audio +            '141', '172', '140', '139', '171', +        ] + +        for f1id, f2id in zip(order, order[1:]): +            f1 = YoutubeIE._formats[f1id].copy() +            f1['format_id'] = f1id +            f2 = YoutubeIE._formats[f2id].copy() +            f2['format_id'] = f2id + +            info_dict = {'formats': [f1, f2], 'extractor': 'youtube'} +            ydl = YDL() +            yie = YoutubeIE(ydl) +            yie._sort_formats(info_dict['formats']) +            ydl.process_ie_result(info_dict) +            downloaded = ydl.downloaded_info_dicts[0] +            self.assertEqual(downloaded['format_id'], f1id) + +            info_dict = {'formats': [f2, f1], 'extractor': 'youtube'} +            ydl = YDL() +            yie = YoutubeIE(ydl) +            yie._sort_formats(info_dict['formats']) +            ydl.process_ie_result(info_dict) +            downloaded = ydl.downloaded_info_dicts[0] +            self.assertEqual(downloaded['format_id'], f1id) +      def test_add_extra_info(self):          test_dict = {              'extractor': 'Foo', diff --git a/test/test_playlists.py b/test/test_playlists.py index 1b7b4e3d8..9d522b357 100644 --- a/test/test_playlists.py +++ b/test/test_playlists.py @@ -28,7 +28,8 @@ from youtube_dl.extractor import (      BandcampAlbumIE,      SmotriCommunityIE,      SmotriUserIE, -    IviCompilationIE +    IviCompilationIE, +    ImdbListIE,  ) @@ -187,6 +188,15 @@ class TestPlaylists(unittest.TestCase):          self.assertEqual(result['id'], u'dezhurnyi_angel/season2')          self.assertEqual(result['title'], u'Дежурный ангел (2010 - 2012) 2 сезон')          self.assertTrue(len(result['entries']) >= 20) +         +    def test_imdb_list(self): +        dl = FakeYDL() +        ie = ImdbListIE(dl) +        result = ie.extract('http://www.imdb.com/list/sMjedvGDd8U') +        self.assertIsPlaylist(result) +        self.assertEqual(result['id'], u'sMjedvGDd8U') +        self.assertEqual(result['title'], u'Animated and Family Films') +        self.assertTrue(len(result['entries']) >= 48)  if __name__ == '__main__': diff --git a/test/test_utils.py b/test/test_utils.py index e5778cd83..bee355ee0 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -18,6 +18,7 @@ from youtube_dl.utils import (      find_xpath_attr,      get_meta_content,      orderedSet, +    parse_duration,      sanitize_filename,      shell_quote,      smuggle_url, @@ -192,5 +193,12 @@ class TestUtil(unittest.TestCase):              url_basename(u'http://media.w3.org/2010/05/sintel/trailer.mp4'),              u'trailer.mp4') +    def test_parse_duration(self): +        self.assertEqual(parse_duration(None), None) +        self.assertEqual(parse_duration('1'), 1) +        self.assertEqual(parse_duration('1337:12'), 80232) +        self.assertEqual(parse_duration('9:12:43'), 33163) +        self.assertEqual(parse_duration('x:y'), None) +  if __name__ == '__main__':      unittest.main() | 
