aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2013-06-04 10:36:36 -0700
committerFilippo Valsorda <filippo.valsorda@gmail.com>2013-06-04 10:36:36 -0700
commit1142d311648fe96b0a444a9291233e31e443da41 (patch)
treef9ffda9064486a9cdfc0ba881aa7c1ca3a2e00df
parent9131bde941c49482affe9b10dd26eb187e073b79 (diff)
parent57bde0d9c7959bd9dadd4a9f3c0b065d5b7978bf (diff)
downloadyoutube-dl-1142d311648fe96b0a444a9291233e31e443da41.tar.xz
Merge pull request #863 from davidcl/master
Add some tests to match Justin.tv / Twitch.tv URLs
-rw-r--r--test/test_all_urls.py18
1 files changed, 17 insertions, 1 deletions
diff --git a/test/test_all_urls.py b/test/test_all_urls.py
index a40360122..dd67286a7 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, YoutubeChannelIE
+from youtube_dl.InfoExtractors import YoutubeIE, YoutubePlaylistIE, YoutubeChannelIE, JustinTVIE
class TestAllURLsMatching(unittest.TestCase):
def test_youtube_playlist_matching(self):
@@ -29,6 +29,22 @@ class TestAllURLsMatching(unittest.TestCase):
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_justin_tv_channelid_matching(self):
+ self.assertTrue(JustinTVIE.suitable(u"justin.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"twitch.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"www.justin.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"www.twitch.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"http://www.justin.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/vanillatv"))
+ self.assertTrue(JustinTVIE.suitable(u"http://www.justin.tv/vanillatv/"))
+ self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/vanillatv/"))
+
+ def test_justintv_videoid_matching(self):
+ self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/vanillatv/b/328087483"))
+
+ def test_justin_tv_chapterid_matching(self):
+ self.assertTrue(JustinTVIE.suitable(u"http://www.twitch.tv/tsm_theoddone/c/2349361"))
+
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')