aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-04-19 21:57:08 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-04-19 21:57:08 +0200
commitdce9027045f061649bc20f6ef48cbbce8cec87df (patch)
treed391525957879dd547da18c98299f9a187af4e3e /test
parentfeba604e9256b48972dfe4b5658ada4b300581cd (diff)
parentd281274bf250065f876bb4f75fb6f711e1a26eba (diff)
Merge branch 'extract_info_rewrite'
Diffstat (limited to 'test')
-rw-r--r--test/test_youtube_lists.py43
1 files changed, 26 insertions, 17 deletions
diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py
index f4705bc5b..9e91484f8 100644
--- a/test/test_youtube_lists.py
+++ b/test/test_youtube_lists.py
@@ -10,6 +10,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
from youtube_dl.InfoExtractors import YoutubeUserIE, YoutubePlaylistIE, YoutubeIE
from youtube_dl.utils import *
+from youtube_dl.FileDownloader import FileDownloader
PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
@@ -22,7 +23,7 @@ proxy_handler = compat_urllib_request.ProxyHandler()
opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler())
compat_urllib_request.install_opener(opener)
-class FakeDownloader(object):
+class FakeDownloader(FileDownloader):
def __init__(self):
self.result = []
self.params = parameters
@@ -30,35 +31,42 @@ class FakeDownloader(object):
print(s)
def trouble(self, s):
raise Exception(s)
- def download(self, x):
- self.result.append(x)
+ def extract_info(self, url):
+ self.result.append(url)
+ return url
class TestYoutubeLists(unittest.TestCase):
+ def assertIsPlaylist(self,info):
+ """Make sure the info has '_type' set to 'playlist'"""
+ self.assertEqual(info['_type'], 'playlist')
+
def test_youtube_playlist(self):
dl = FakeDownloader()
ie = YoutubePlaylistIE(dl)
- ie.extract('https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re')
- ytie_results = [YoutubeIE()._extract_id(r[0]) for r in dl.result]
+ result = ie.extract('https://www.youtube.com/playlist?list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re')[0]
+ self.assertIsPlaylist(result)
+ ytie_results = [YoutubeIE()._extract_id(url['url']) for url in result['entries']]
self.assertEqual(ytie_results, [ 'bV9L5Ht9LgY', 'FXxLjLQi3Fg', 'tU3Bgo5qJZE'])
def test_issue_673(self):
dl = FakeDownloader()
ie = YoutubePlaylistIE(dl)
- ie.extract('PLBB231211A4F62143')
- self.assertTrue(len(dl.result) > 40)
+ result = ie.extract('PLBB231211A4F62143')[0]
+ self.assertTrue(len(result['entries']) > 40)
def test_youtube_playlist_long(self):
dl = FakeDownloader()
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/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q')[0]
+ self.assertIsPlaylist(result)
+ self.assertTrue(len(result['entries']) >= 799)
def test_youtube_playlist_with_deleted(self):
#651
dl = FakeDownloader()
ie = YoutubePlaylistIE(dl)
- ie.extract('https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC')
- ytie_results = [YoutubeIE()._extract_id(r[0]) for r in dl.result]
+ result = ie.extract('https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC')[0]
+ ytie_results = [YoutubeIE()._extract_id(url['url']) for url in result['entries']]
self.assertFalse('pElCt5oNDuI' in ytie_results)
self.assertFalse('KdPEApIVdWM' in ytie_results)
@@ -66,10 +74,11 @@ class TestYoutubeLists(unittest.TestCase):
dl = FakeDownloader()
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')
+ result = ie.extract('https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8')[0]
+ entries = 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_channel(self):
# I give up, please find a channel that does paginate and test this like test_youtube_playlist_long
@@ -78,8 +87,8 @@ class TestYoutubeLists(unittest.TestCase):
def test_youtube_user(self):
dl = FakeDownloader()
ie = YoutubeUserIE(dl)
- ie.extract('https://www.youtube.com/user/TheLinuxFoundation')
- self.assertTrue(len(dl.result) >= 320)
+ result = ie.extract('https://www.youtube.com/user/TheLinuxFoundation')[0]
+ self.assertTrue(len(result['entries']) >= 320)
if __name__ == '__main__':
unittest.main()