projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1266 from MiLk/py-generator
[youtube-dl]
/
test
/
test_download.py
diff --git
a/test/test_download.py
b/test/test_download.py
index db43e99620a140cb09e760f9b4e37542f4deb81b..21cb2e6941cd8c6cae4c220535b9193f004999c7 100644
(file)
--- a/
test/test_download.py
+++ b/
test/test_download.py
@@
-14,7
+14,6
@@
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 *
PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
from youtube_dl.utils import *
PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
@@
-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':