aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2013-06-25 14:38:00 +0200
committerFilippo Valsorda <filippo.valsorda@gmail.com>2013-06-25 14:38:00 +0200
commitf7ab6cbe160afbba60537c7a830a4c65c6f0b3ea (patch)
treee65afa7a40da191a40de732849712f3ae432384d
parent577d02370d3dc6b23971962e9339d9302a7ef0ba (diff)
add tests for use_cipher_signature videos (#897) and the ability to test multiple videos per IE
-rw-r--r--test/test_download.py4
-rw-r--r--test/tests.json26
2 files changed, 29 insertions, 1 deletions
diff --git a/test/test_download.py b/test/test_download.py
index 9af626dca..067bde4bb 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -153,9 +153,11 @@ def generator(test_case):
return test_template
### And add them to TestDownload
-for test_case in defs:
+for n, test_case in enumerate(defs):
test_method = generator(test_case)
test_method.__name__ = "test_{0}".format(test_case["name"])
+ if getattr(TestDownload, test_method.__name__, False):
+ test_method.__name__ = "test_{0}_{1}".format(test_case["name"], n)
setattr(TestDownload, test_method.__name__, test_method)
del test_method
diff --git a/test/tests.json b/test/tests.json
index fd037d818..f6a70f153 100644
--- a/test/tests.json
+++ b/test/tests.json
@@ -12,6 +12,32 @@
}
},
{
+ "name": "Youtube",
+ "url": "http://www.youtube.com/watch?v=1ltcDfZMA3U",
+ "file": "1ltcDfZMA3U.flv",
+ "note": "Test VEVO video (#897)",
+ "info_dict": {
+ "upload_date": "20070518",
+ "title": "Maps - It Will Find You",
+ "description": "Music video by Maps performing It Will Find You.",
+ "uploader": "MuteUSA",
+ "uploader_id": "MuteUSA"
+ }
+ },
+ {
+ "name": "Youtube",
+ "url": "http://www.youtube.com/watch?v=UxxajLWwzqY",
+ "file": "UxxajLWwzqY.mp4",
+ "note": "Test generic use_cipher_signature video (#897)",
+ "info_dict": {
+ "upload_date": "20120506",
+ "title": "Icona Pop - I Love It (feat. Charli XCX) [OFFICIAL VIDEO]",
+ "description": "md5:b085c9804f5ab69f4adea963a2dceb3c",
+ "uploader": "IconaPop",
+ "uploader_id": "IconaPop"
+ }
+ },
+ {
"name": "Dailymotion",
"md5": "392c4b85a60a90dc4792da41ce3144eb",
"url": "http://www.dailymotion.com/video/x33vw9_tutoriel-de-youtubeur-dl-des-video_tech",