]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Allow moving tests into IE files
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Jun 2013 16:28:45 +0000 (18:28 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 27 Jun 2013 16:28:45 +0000 (18:28 +0200)
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.

test/test_download.py
test/tests.json
youtube_dl/extractor/worldstarhiphop.py

index 067bde4bb9159f4d56ae34bbc4690a8425a11550..0428a79fe7450e0fdbd97cc698c243fa76d9ea6e 100644 (file)
@@ -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)
 
index d34d960f7936d5228513f17a71d79224ca758f39..f0cec8384f9f64f510be278c605cab611a009f79 100644 (file)
         "uploader": "ljfriel2"
     }
   },
-  {
-    "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",
index 531d0889fbc06273eb8a5f3a7ea7a77cc993438f..5b9779c05853ab815aa56d710476356c56c8449b 100644 (file)
@@ -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)