projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial slash in Google+ photos link was removed
[youtube-dl]
/
test
/
test_download.py
diff --git
a/test/test_download.py
b/test/test_download.py
index 9af626dca0cfd5498aea48aef8825e740a87082a..21cb2e6941cd8c6cae4c220535b9193f004999c7 100644
(file)
--- a/
test/test_download.py
+++ b/
test/test_download.py
@@
-14,10
+14,8
@@
import binascii
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import youtube_dl.YoutubeDL
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import youtube_dl.YoutubeDL
-import youtube_dl.extractor
from youtube_dl.utils import *
from youtube_dl.utils import *
-DEF_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'tests.json')
PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
RETRIES = 3
PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
RETRIES = 3
@@
-56,8
+54,9
@@
def _file_md5(fn):
with open(fn, 'rb') as f:
return hashlib.md5(f.read()).hexdigest()
with open(fn, 'rb') as f:
return hashlib.md5(f.read()).hexdigest()
-with io.open(DEF_FILE, encoding='utf-8') as deff:
- defs = json.load(deff)
+from helper import get_testcases
+defs = get_testcases()
+
with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
parameters = json.load(pf)
with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
parameters = json.load(pf)
@@
-73,22
+72,23
@@
def generator(test_case):
def test_template(self):
ie = youtube_dl.extractor.get_info_extractor(test_case['name'])
def test_template(self):
ie = youtube_dl.extractor.get_info_extractor(test_case['name'])
+ def print_skipping(reason):
+ print('Skipping %s: %s' % (test_case['name'], reason))
if not ie._WORKING:
if not ie._WORKING:
- print
('Skipping:
IE marked as not _WORKING')
+ print
_skipping('
IE marked as not _WORKING')
return
if 'playlist' not in test_case and not test_case['file']:
return
if 'playlist' not in test_case and not test_case['file']:
- print
('Skipping:
No output file specified')
+ print
_skipping('
No output file specified')
return
if 'skip' in test_case:
return
if 'skip' in test_case:
- print
('Skipping: {0}'.format(test_case['skip'])
)
+ print
_skipping(test_case['skip']
)
return
params = self.parameters.copy()
params.update(test_case.get('params', {}))
ydl = YoutubeDL(params)
return
params = self.parameters.copy()
params.update(test_case.get('params', {}))
ydl = YoutubeDL(params)
- for ie in youtube_dl.extractor.gen_extractors():
- ydl.add_info_extractor(ie)
+ ydl.add_default_info_extractors()
finished_hook_called = set()
def _hook(status):
if status['status'] == 'finished':
finished_hook_called = set()
def _hook(status):
if status['status'] == 'finished':
@@
-153,9
+153,14
@@
def generator(test_case):
return test_template
### And add them to TestDownload
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 = generator(test_case)
- test_method.__name__ = "test_{0}".format(test_case["name"])
+ tname = 'test_' + str(test_case['name'])
+ i = 1
+ while hasattr(TestDownload, tname):
+ tname = 'test_' + str(test_case['name']) + '_' + str(i)
+ i += 1
+ test_method.__name__ = tname
setattr(TestDownload, test_method.__name__, test_method)
del test_method
setattr(TestDownload, test_method.__name__, test_method)
del test_method