Explorar o código

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.
Philipp Hagemeister %!s(int64=12) %!d(string=hai) anos
pai
achega
6b47c7f24e
Modificáronse 3 ficheiros con 16 adicións e 10 borrados
  1. 7 0
      test/test_download.py
  2. 0 9
      test/tests.json
  3. 9 1
      youtube_dl/extractor/worldstarhiphop.py

+ 7 - 0
test/test_download.py

@@ -58,6 +58,13 @@ def _file_md5(fn):
 
 
 with io.open(DEF_FILE, encoding='utf-8') as deff:
 with io.open(DEF_FILE, encoding='utf-8') as deff:
     defs = json.load(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:
 with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
     parameters = json.load(pf)
     parameters = json.load(pf)
 
 

+ 0 - 9
test/tests.json

@@ -435,15 +435,6 @@
         "uploader": "ljfriel2"
         "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",
     "name": "ARD",
     "url": "http://www.ardmediathek.de/das-erste/tagesschau-in-100-sek?documentId=14077640",
     "url": "http://www.ardmediathek.de/das-erste/tagesschau-in-100-sek?documentId=14077640",

+ 9 - 1
youtube_dl/extractor/worldstarhiphop.py

@@ -5,7 +5,15 @@ from .common import InfoExtractor
 
 
 class WorldStarHipHopIE(InfoExtractor):
 class WorldStarHipHopIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www|m)\.worldstar(?:candy|hiphop)\.com/videos/video\.php\?v=(?P<id>.*)'
     _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):
     def _real_extract(self, url):
         m = re.match(self._VALID_URL, url)
         m = re.match(self._VALID_URL, url)