aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-06-27 18:28:45 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-06-27 18:28:45 +0200
commit6b47c7f24ef7fee9f714a71f51c27ff61ed632e9 (patch)
tree980cff35223b2348443ad2ab760b8000eb76ce8f /test
parentd798e1c7a99d75b5e04b71b01faf925614b58d59 (diff)
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 (limited to 'test')
-rw-r--r--test/test_download.py7
-rw-r--r--test/tests.json9
2 files changed, 7 insertions, 9 deletions
diff --git a/test/test_download.py b/test/test_download.py
index 067bde4bb..0428a79fe 100644
--- 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
index d34d960f7..f0cec8384 100644
--- 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",