projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master'
[youtube-dl]
/
test
/
test_age_restriction.py
diff --git
a/test/test_age_restriction.py
b/test/test_age_restriction.py
index d500c6edceb6018510b9226d925d9f407b72fcbd..71e80b037a5cc99fd0cb1a6711d20cfb59e01b34 100644
(file)
--- a/
test/test_age_restriction.py
+++ b/
test/test_age_restriction.py
@@
-6,15
+6,14
@@
import sys
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from test.helper import global_setup, try_rm
-global_setup()
+from test.helper import try_rm
from youtube_dl import YoutubeDL
def _download_restricted(url, filename, age):
from youtube_dl import YoutubeDL
def _download_restricted(url, filename, age):
- """ Returns true if
f
the file has been downloaded """
+ """ Returns true if the file has been downloaded """
params = {
'age_limit': age,
params = {
'age_limit': age,
@@
-24,7
+23,7
@@
def _download_restricted(url, filename, age):
}
ydl = YoutubeDL(params)
ydl.add_default_info_extractors()
}
ydl = YoutubeDL(params)
ydl.add_default_info_extractors()
- json_filename =
filename
+ '.info.json'
+ json_filename =
os.path.splitext(filename)[0]
+ '.info.json'
try_rm(json_filename)
ydl.download([url])
res = os.path.exists(json_filename)
try_rm(json_filename)
ydl.download([url])
res = os.path.exists(json_filename)