From f7ab6cbe160afbba60537c7a830a4c65c6f0b3ea Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Tue, 25 Jun 2013 14:38:00 +0200 Subject: [PATCH] add tests for use_cipher_signature videos (#897) and the ability to test multiple videos per IE --- test/test_download.py | 4 +++- test/tests.json | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) 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 _hook(status): 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 @@ -11,6 +11,32 @@ "description": "test chars: \"'/\\ä↭𝕐\n\nThis is a test video for youtube-dl.\n\nFor more information, contact phihag@phihag.de ." } }, + { + "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",