commit 6b47c7f24ef7fee9f714a71f51c27ff61ed632e9
parent d798e1c7a99d75b5e04b71b01faf925614b58d59
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 27 Jun 2013 18:28:45 +0200
Allow moving tests into IE files
Allow adding download tests right in the IE file.
This will cut down on merge conflicts and make it more likely that new IE authors will add tests right away.
Diffstat:
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/test/test_download.py b/test/test_download.py
@@ -58,6 +58,13 @@ def _file_md5(fn):
with io.open(DEF_FILE, encoding='utf-8') as deff:
defs = json.load(deff)
+for ie in youtube_dl.extractor.gen_extractors():
+ t = getattr(ie, '_TEST', None)
+ if t:
+ t['name'] = type(ie).__name__[:-len('IE')]
+ defs.append(t)
+
+
with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
parameters = json.load(pf)
diff --git a/test/tests.json b/test/tests.json
@@ -436,15 +436,6 @@
}
},
{
- "name": "WorldStarHipHop",
- "url": "http://www.worldstarhiphop.com/videos/video.php?v=wshh6a7q1ny0G34ZwuIO",
- "file": "wshh6a7q1ny0G34ZwuIO.mp4",
- "md5": "9d04de741161603bf7071bbf4e883186",
- "info_dict": {
- "title": "Video: KO Of The Week: MMA Fighter Gets Knocked Out By Swift Head Kick!"
- }
- },
- {
"name": "ARD",
"url": "http://www.ardmediathek.de/das-erste/tagesschau-in-100-sek?documentId=14077640",
"file": "14077640.mp4",
diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py
@@ -5,7 +5,15 @@ from .common import InfoExtractor
class WorldStarHipHopIE(InfoExtractor):
_VALID_URL = r'https?://(?:www|m)\.worldstar(?:candy|hiphop)\.com/videos/video\.php\?v=(?P<id>.*)'
- IE_NAME = u'WorldStarHipHop'
+ _TEST = {
+ "url": "http://www.worldstarhiphop.com/videos/video.php?v=wshh6a7q1ny0G34ZwuIO",
+ "file": "wshh6a7q1ny0G34ZwuIO.mp4",
+ "md5": "9d04de741161603bf7071bbf4e883186",
+ "info_dict": {
+ "title": "Video: KO Of The Week: MMA Fighter Gets Knocked Out By Swift Head Kick!"
+ }
+ }
+
def _real_extract(self, url):
m = re.match(self._VALID_URL, url)
