diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-01-22 18:18:21 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-01-22 18:18:21 +0100 |
| commit | 78111136db788918452a80233e74fd4c506eb6f8 (patch) | |
| tree | 78057bb0d23dc1713dcecc6c5aac4cb22dff6bc2 | |
| parent | 650ab5beebfa555383365602c914729249fad4c6 (diff) | |
| download | youtube-dl-78111136db788918452a80233e74fd4c506eb6f8.tar.xz | |
[twitch] Move URL matching tests into extractor
| -rw-r--r-- | test/test_all_urls.py | 13 | ||||
| -rw-r--r-- | youtube_dl/extractor/twitch.py | 7 |
2 files changed, 5 insertions, 15 deletions
diff --git a/test/test_all_urls.py b/test/test_all_urls.py index 88fda76a4..e66264b4b 100644 --- a/test/test_all_urls.py +++ b/test/test_all_urls.py @@ -14,7 +14,6 @@ from test.helper import gettestcases from youtube_dl.extractor import ( FacebookIE, gen_extractors, - TwitchIE, YoutubeIE, ) @@ -72,18 +71,6 @@ class TestAllURLsMatching(unittest.TestCase): self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url']) self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url']) - def test_twitch_channelid_matching(self): - self.assertTrue(TwitchIE.suitable('twitch.tv/vanillatv')) - self.assertTrue(TwitchIE.suitable('www.twitch.tv/vanillatv')) - self.assertTrue(TwitchIE.suitable('http://www.twitch.tv/vanillatv')) - self.assertTrue(TwitchIE.suitable('http://www.twitch.tv/vanillatv/')) - - def test_twitch_videoid_matching(self): - self.assertTrue(TwitchIE.suitable('http://www.twitch.tv/vanillatv/b/328087483')) - - def test_twitch_chapterid_matching(self): - self.assertTrue(TwitchIE.suitable('http://www.twitch.tv/tsm_theoddone/c/2349361')) - def test_youtube_extract(self): assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id) assertExtractId('http://www.youtube.com/watch?&v=BaW_jenozKc', 'BaW_jenozKc') diff --git a/youtube_dl/extractor/twitch.py b/youtube_dl/extractor/twitch.py index 8866e5182..017eff742 100644 --- a/youtube_dl/extractor/twitch.py +++ b/youtube_dl/extractor/twitch.py @@ -148,14 +148,17 @@ class TwitchChapterIE(TwitchItemBaseIE): _ITEM_TYPE = 'chapter' _ITEM_SHORTCUT = 'c' - _TEST = { + _TESTS = [{ 'url': 'http://www.twitch.tv/acracingleague/c/5285812', 'info_dict': { 'id': 'c5285812', 'title': 'ACRL Off Season - Sports Cars @ Nordschleife', }, 'playlist_mincount': 3, - } + }, { + 'url': 'http://www.twitch.tv/tsm_theoddone/c/2349361', + 'only_matching': True, + }] class TwitchVodIE(TwitchItemBaseIE): |