aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2012-12-11 11:33:15 +0100
committerFilippo Valsorda <filippo.valsorda@gmail.com>2012-12-11 11:33:15 +0100
commit1ca63e3ae3f7f61a9c38e04eec421faa42a1faee (patch)
tree556b8e3485244f499fd88fd0102328effe27db6d /test
parent59ce20191588028ee90551b40b33a8a36d778eec (diff)
the test didn't load our Gzip opener
this was blocking the Vimeo test + some more gentest fixes
Diffstat (limited to 'test')
-rwxr-xr-xtest/gentests.py25
1 files changed, 20 insertions, 5 deletions
diff --git a/test/gentests.py b/test/gentests.py
index 9352d6d94..a20b139f5 100755
--- a/test/gentests.py
+++ b/test/gentests.py
@@ -23,13 +23,28 @@ import os
import json
import unittest
import sys
+import socket
# Allow direct execution
import os
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from youtube_dl.FileDownloader import FileDownloader
+import youtube_dl.FileDownloader
import youtube_dl.InfoExtractors
+from youtube_dl.utils import *
+
+# General configuration (from __init__, not very elegant...)
+jar = compat_cookiejar.CookieJar()
+cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar)
+proxy_handler = compat_urllib_request.ProxyHandler()
+opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler())
+compat_urllib_request.install_opener(opener)
+socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words)
+
+class FileDownloader(youtube_dl.FileDownloader):
+ def __init__(self, *args, **kwargs):
+ youtube_dl.FileDownloader.__init__(self, *args, **kwargs)
+ self.to_stderr = self.to_screen
def _file_md5(fn):
with open(fn, 'rb') as f:
@@ -76,12 +91,12 @@ def gentests():
with io.open(TEST_FILE, 'w', encoding='utf-8') as testf:
testf.write(HEADER)
spaces = ' ' * 4
- write = lambda l: testf.write(spaces + l + '\n')
+ write = lambda l: testf.write(spaces + l + u'\n')
for d in defs:
name = d['name']
ie = getattr(youtube_dl.InfoExtractors, name + 'IE')
- testf.write('\n')
+ testf.write(u'\n')
write('@_skip_unless(youtube_dl.InfoExtractors.' + name + 'IE._WORKING, "IE marked as not _WORKING")')
if not d['file']:
write('@_skip("No output file specified")')
@@ -101,7 +116,7 @@ def gentests():
write(' md5_for_file = _file_md5(filename)')
write(' self.assertEqual(md5_for_file, ' + repr(d['md5']) + ')')
- testf.write('\n\n')
+ testf.write(u'\n\n')
write('def tearDown(self):')
for d in defs:
if d['file']:
@@ -109,7 +124,7 @@ def gentests():
write(' os.remove(' + repr(d['file']) + ')')
else:
write(' # No file specified for ' + d['name'])
- testf.write('\n')
+ testf.write(u'\n')
testf.write(FOOTER)
if __name__ == '__main__':