aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test_all_urls.py7
-rw-r--r--test/test_download.py2
-rw-r--r--test/test_youtube_lists.py57
-rw-r--r--test/test_youtube_subtitles.py2
-rw-r--r--test/tests.json9
5 files changed, 54 insertions, 23 deletions
diff --git a/test/test_all_urls.py b/test/test_all_urls.py
index 69717b3fc..a40360122 100644
--- a/test/test_all_urls.py
+++ b/test/test_all_urls.py
@@ -7,7 +7,7 @@ import unittest
import os
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from youtube_dl.InfoExtractors import YoutubeIE, YoutubePlaylistIE
+from youtube_dl.InfoExtractors import YoutubeIE, YoutubePlaylistIE, YoutubeChannelIE
class TestAllURLsMatching(unittest.TestCase):
def test_youtube_playlist_matching(self):
@@ -24,6 +24,11 @@ class TestAllURLsMatching(unittest.TestCase):
self.assertTrue(YoutubeIE.suitable(u'PLtS2H6bU1M'))
self.assertFalse(YoutubeIE.suitable(u'https://www.youtube.com/watch?v=AV6J6_AeFEQ&playnext=1&list=PL4023E734DA416012')) #668
+ def test_youtube_channel_matching(self):
+ self.assertTrue(YoutubeChannelIE.suitable('https://www.youtube.com/channel/HCtnHdj3df7iM'))
+ self.assertTrue(YoutubeChannelIE.suitable('https://www.youtube.com/channel/HCtnHdj3df7iM?feature=gb_ch_rec'))
+ self.assertTrue(YoutubeChannelIE.suitable('https://www.youtube.com/channel/HCtnHdj3df7iM/videos'))
+
def test_youtube_extract(self):
self.assertEqual(YoutubeIE()._extract_id('http://www.youtube.com/watch?&v=BaW_jenozKc'), 'BaW_jenozKc')
self.assertEqual(YoutubeIE()._extract_id('https://www.youtube.com/watch?&v=BaW_jenozKc'), 'BaW_jenozKc')
diff --git a/test/test_download.py b/test/test_download.py
index e3513efba..cf8028718 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -67,7 +67,7 @@ class TestDownload(unittest.TestCase):
def generator(test_case):
def test_template(self):
- ie = getattr(youtube_dl.InfoExtractors, test_case['name'] + 'IE')
+ ie = youtube_dl.InfoExtractors.get_info_extractor(test_case['name'])#getattr(youtube_dl.InfoExtractors, test_case['name'] + 'IE')
if not ie._WORKING:
print('Skipping: IE marked as not _WORKING')
return
diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py
index f4705bc5b..c7f00af32 100644
--- a/test/test_youtube_lists.py
+++ b/test/test_youtube_lists.py
@@ -8,8 +8,9 @@ import json
import os
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from youtube_dl.InfoExtractors import YoutubeUserIE, YoutubePlaylistIE, YoutubeIE
+from youtube_dl.InfoExtractors import YoutubeUserIE, YoutubePlaylistIE, YoutubeIE, YoutubeChannelIE
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,44 @@ 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)
+ self.assertEqual(result['title'], 'ytdl test PL')
+ 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.assertEqual(result['title'], 'Team Fortress 2')
+ 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,20 +76,27 @@ 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
- pass # TODO
+ dl = FakeDownloader()
+ ie = YoutubeChannelIE(dl)
+ #test paginated channel
+ result = ie.extract('https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w')[0]
+ self.assertTrue(len(result['entries']) > 90)
+ #test autogenerated channel
+ result = ie.extract('https://www.youtube.com/channel/HCtnHdj3df7iM/videos')[0]
+ self.assertTrue(len(result['entries']) > 20)
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()
diff --git a/test/test_youtube_subtitles.py b/test/test_youtube_subtitles.py
index 30f2246dd..b4909091b 100644
--- a/test/test_youtube_subtitles.py
+++ b/test/test_youtube_subtitles.py
@@ -80,7 +80,7 @@ class TestYoutubeSubtitles(unittest.TestCase):
IE = YoutubeIE(DL)
info_dict = IE.extract('QRS8MkLhQmM')
subtitles = info_dict[0]['subtitles']
- self.assertEqual(len(subtitles), 12)
+ self.assertEqual(len(subtitles), 13)
def test_youtube_subtitles_format(self):
DL = FakeDownloader()
DL.params['writesubtitles'] = True
diff --git a/test/tests.json b/test/tests.json
index 7808a07de..2b56738a0 100644
--- a/test/tests.json
+++ b/test/tests.json
@@ -337,6 +337,15 @@
"title": "11.04.2013 09:23 Uhr - Tagesschau in 100 Sekunden"
},
"skip": "Requires rtmpdump"
+ },
+ {
+ "name": "Tumblr",
+ "url": "http://birthdayproject2012.tumblr.com/post/17258355236/a-sample-video-from-leeann-if-you-need-an-idea",
+ "file": "17258355236.mp4",
+ "md5": "7c6a514d691b034ccf8567999e9e88a3",
+ "info_dict": {
+ "title": "A sample video from LeeAnn. (If you need an idea..."
+ }
}
]
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-05 13:21:30 +0000