Merge tag 'upstream/2017.02.07'

[youtubedl] / test / test_age_restriction.py

diff --git a/test/test_age_restriction.py b/test/test_age_restriction.py
index d500c6edceb6018510b9226d925d9f407b72fcbd..6f5513faa2c5551ce3f3c9d2967a55b28adad858 100644 (file)
--- a/test/test_age_restriction.py
+++ b/test/test_age_restriction.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
 #!/usr/bin/env python

+from __future__ import unicode_literals

 
 # Allow direct execution
 import os
 
 # Allow direct execution
 import os


@@ -6,25 +7,24 @@ 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 iff the file has been downloaded """
+    """ Returns true if the file has been downloaded """

 
     params = {
         'age_limit': age,
         'skip_download': True,
         'writeinfojson': True,
 
     params = {
         'age_limit': age,
         'skip_download': True,
         'writeinfojson': True,

-        "outtmpl": "%(id)s.%(ext)s",
+        'outtmpl': '%(id)s.%(ext)s',

     }
     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)


@@ -45,11 +45,6 @@ class TestAgeRestriction(unittest.TestCase):
             'http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/',
             '505835.mp4', 2, old_age=25)
 
             'http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/',
             '505835.mp4', 2, old_age=25)
 

-    def test_pornotube(self):
-        self._assert_restricted(
-            'http://pornotube.com/c/173/m/1689755/Marilyn-Monroe-Bathing',
-            '1689755.flv', 13)
-

 
 if __name__ == '__main__':
     unittest.main()
 
 if __name__ == '__main__':
     unittest.main()