aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2013-02-26 19:02:31 +0100
committerFilippo Valsorda <filippo.valsorda@gmail.com>2013-02-26 19:06:41 +0100
commit89de9eb125abd273d50c9c5cc2d2ce80fa8922f3 (patch)
tree86c4dbc3543d07138767277d79ee417507ac18b6 /test
parent6324fd1d7494449c168805db8e3f9fa45396367b (diff)
downloadyoutube-dl-89de9eb125abd273d50c9c5cc2d2ce80fa8922f3.zip
youtube-dl-89de9eb125abd273d50c9c5cc2d2ce80fa8922f3.tar.gz
youtube-dl-89de9eb125abd273d50c9c5cc2d2ce80fa8922f3.tar.bz2
Modified Youtube video/playlist matching; fixes #668; fixes #585
Diffstat (limited to 'test')
-rw-r--r--test/test_all_urls.py14
-rw-r--r--test/test_youtube_lists.py13
2 files changed, 23 insertions, 4 deletions
diff --git a/test/test_all_urls.py b/test/test_all_urls.py
index 06de8e7..69717b3 100644
--- a/test/test_all_urls.py
+++ b/test/test_all_urls.py
@@ -11,12 +11,18 @@ from youtube_dl.InfoExtractors import YoutubeIE, YoutubePlaylistIE
class TestAllURLsMatching(unittest.TestCase):
def test_youtube_playlist_matching(self):
- self.assertTrue(YoutubePlaylistIE().suitable(u'ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8'))
- self.assertTrue(YoutubePlaylistIE().suitable(u'PL63F0C78739B09958'))
- self.assertFalse(YoutubePlaylistIE().suitable(u'PLtS2H6bU1M'))
+ self.assertTrue(YoutubePlaylistIE.suitable(u'ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8'))
+ self.assertTrue(YoutubePlaylistIE.suitable(u'UUBABnxM4Ar9ten8Mdjj1j0Q')) #585
+ self.assertTrue(YoutubePlaylistIE.suitable(u'PL63F0C78739B09958'))
+ self.assertTrue(YoutubePlaylistIE.suitable(u'https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q'))
+ self.assertTrue(YoutubePlaylistIE.suitable(u'https://www.youtube.com/course?list=ECUl4u3cNGP61MdtwGTqZA0MreSaDybji8'))
+ self.assertTrue(YoutubePlaylistIE.suitable(u'https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC'))
+ self.assertTrue(YoutubePlaylistIE.suitable(u'https://www.youtube.com/watch?v=AV6J6_AeFEQ&playnext=1&list=PL4023E734DA416012')) #668
+ self.assertFalse(YoutubePlaylistIE.suitable(u'PLtS2H6bU1M'))
def test_youtube_matching(self):
- self.assertTrue(YoutubeIE().suitable(u'PLtS2H6bU1M'))
+ 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_extract(self):
self.assertEqual(YoutubeIE()._extract_id('http://www.youtube.com/watch?&v=BaW_jenozKc'), 'BaW_jenozKc')
diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py
index 69b0f44..7055d5a 100644
--- a/test/test_youtube_lists.py
+++ b/test/test_youtube_lists.py
@@ -41,6 +41,18 @@ class TestYoutubeLists(unittest.TestCase):
self.assertEqual(map(lambda x: YoutubeIE()._extract_id(x[0]), DL.result),
[ 'bV9L5Ht9LgY', 'FXxLjLQi3Fg', 'tU3Bgo5qJZE' ])
+ #661
+ DL = FakeDownloader()
+ IE = YoutubePlaylistIE(DL)
+ IE.extract('PLMCmkNmxw6Z9eduM7BZjSEh7HiU543Ig0')
+ self.assertTrue(len(DL.result) > 20)
+
+ #673
+ DL = FakeDownloader()
+ IE = YoutubePlaylistIE(DL)
+ IE.extract('PLBB231211A4F62143')
+ self.assertTrue(len(DL.result) > 40)
+
def test_youtube_playlist_long(self):
DL = FakeDownloader()
IE = YoutubePlaylistIE(DL)
@@ -48,6 +60,7 @@ class TestYoutubeLists(unittest.TestCase):
self.assertTrue(len(DL.result) >= 799)
def test_youtube_playlist_with_deleted(self):
+ #651
DL = FakeDownloader()
IE = YoutubePlaylistIE(DL)
IE.extract('https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC')