X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=test%2Ftest_youtube_lists.py;h=c4f0abbeaaacbe3b469320c13a205e8f738c443b;hb=6cd452acffe8d79c895a2ebd0346e2ba7f9e112f;hp=bf0a9b34ebb2ecaac8f85ff8d2f7171cbe7cb68f;hpb=679790eee1e2c90e36e6a722e4c59c8a25c72934;p=youtube-dl

diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py
index bf0a9b34e..c4f0abbea 100644
--- a/test/test_youtube_lists.py
+++ b/test/test_youtube_lists.py
@@ -1,90 +1,71 @@
 #!/usr/bin/env python
-
-import sys
-import unittest
-import json
+from __future__ import unicode_literals
 
 # Allow direct execution
 import os
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+import sys
+import unittest
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from youtube_dl.InfoExtractors import YoutubeUserIE, YoutubePlaylistIE, YoutubeIE
-from youtube_dl.utils import *
+from test.helper import FakeYDL
 
-PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
-with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
-    parameters = json.load(pf)
 
-# General configuration (from __init__, not very elegant...)
-jar = compat_cookiejar.CookieJar()
-cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar)
-proxy_handler = compat_urllib_request.ProxyHandler()
-opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler())
-compat_urllib_request.install_opener(opener)
+from youtube_dl.extractor import (
+    YoutubePlaylistIE,
+    YoutubeIE,
+)
 
-class FakeDownloader(object):
-    def __init__(self):
-        self.result = []
-        self.params = parameters
-    def to_screen(self, s):
-        print(s)
-    def trouble(self, s):
-        raise Exception(s)
-    def download(self, x):
-        self.result.append(x)
 
 class TestYoutubeLists(unittest.TestCase):
-    def test_youtube_playlist(self):
-        dl = FakeDownloader()
-        ie = YoutubePlaylistIE(dl)
-        ie.extract('https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re')
-        self.assertEqual(map(lambda x: YoutubeIE()._extract_id(x[0]), dl.result),
-            [ 'bV9L5Ht9LgY', 'FXxLjLQi3Fg', 'tU3Bgo5qJZE' ])
+    def assertIsPlaylist(self, info):
+        """Make sure the info has '_type' set to 'playlist'"""
+        self.assertEqual(info['_type'], 'playlist')
 
-        #661
-        dl = FakeDownloader()
+    def test_youtube_playlist_noplaylist(self):
+        dl = FakeYDL()
+        dl.params['noplaylist'] = True
         ie = YoutubePlaylistIE(dl)
-        ie.extract('PLMCmkNmxw6Z9eduM7BZjSEh7HiU543Ig0')
-        self.assertTrue(len(dl.result) > 20)
+        result = ie.extract('https://www.youtube.com/watch?v=FXxLjLQi3Fg&list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re')
+        self.assertEqual(result['_type'], 'url')
+        self.assertEqual(YoutubeIE().extract_id(result['url']), 'FXxLjLQi3Fg')
 
-        #673
-        dl = FakeDownloader()
+    def test_youtube_course(self):
+        dl = FakeYDL()
         ie = YoutubePlaylistIE(dl)
-        ie.extract('PLBB231211A4F62143')
-        self.assertTrue(len(dl.result) > 40)
+        # TODO find a > 100 (paginating?) videos course
+        result = ie.extract('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
+        entries = list(result['entries'])
+        self.assertEqual(YoutubeIE().extract_id(entries[0]['url']), 'j9WZyLZCBzs')
+        self.assertEqual(len(entries), 25)
+        self.assertEqual(YoutubeIE().extract_id(entries[-1]['url']), 'rYefUsYuEp0')
 
-    def test_youtube_playlist_long(self):
-        dl = FakeDownloader()
+    def test_youtube_mix(self):
+        dl = FakeYDL()
         ie = YoutubePlaylistIE(dl)
-        ie.extract('https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q')
-        self.assertTrue(len(dl.result) >= 799)
+        result = ie.extract('https://www.youtube.com/watch?v=W01L70IGBgE&index=2&list=RDOQpdSVF_k_w')
+        entries = result['entries']
+        self.assertTrue(len(entries) >= 50)
+        original_video = entries[0]
+        self.assertEqual(original_video['id'], 'OQpdSVF_k_w')
 
-    def test_youtube_playlist_with_deleted(self):
-        #651
-        dl = FakeDownloader()
+    def test_youtube_toptracks(self):
+        print('Skipping: The playlist page gives error 500')
+        return
+        dl = FakeYDL()
         ie = YoutubePlaylistIE(dl)
-        ie.extract('https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC')
-        self.assertFalse('pElCt5oNDuI' in map(lambda x: YoutubeIE()._extract_id(x[0]), dl.result))
-        self.assertFalse('KdPEApIVdWM' in map(lambda x: YoutubeIE()._extract_id(x[0]), dl.result))
+        result = ie.extract('https://www.youtube.com/playlist?list=MCUS')
+        entries = result['entries']
+        self.assertEqual(len(entries), 100)
 
-    def test_youtube_course(self):
-        dl = FakeDownloader()
+    def test_youtube_flat_playlist_titles(self):
+        dl = FakeYDL()
+        dl.params['extract_flat'] = True
         ie = YoutubePlaylistIE(dl)
-        # TODO find a > 100 (paginating?) videos course
-        ie.extract('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')
-        self.assertEqual(YoutubeIE()._extract_id(dl.result[0][0]), 'j9WZyLZCBzs')
-        self.assertEqual(len(dl.result), 25)
-        self.assertEqual(YoutubeIE()._extract_id(dl.result[-1][0]), 'rYefUsYuEp0')
-
-    def test_youtube_channel(self):
-        # I give up, please find a channel that does paginate and test this like test_youtube_playlist_long
-        pass # TODO
+        result = ie.extract('https://www.youtube.com/playlist?list=PL-KKIb8rvtMSrAO9YFbeM6UQrAqoFTUWv')
+        self.assertIsPlaylist(result)
+        for entry in result['entries']:
+            self.assertTrue(entry.get('title'))
 
-    def test_youtube_user(self):
-        dl = FakeDownloader()
-        ie = YoutubeUserIE(dl)
-        ie.extract('https://www.youtube.com/user/TheLinuxFoundation')
-        self.assertTrue(len(dl.result) >= 320)
 
 if __name__ == '__main__':
     unittest.main()