X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=test%2Ftest_download.py;h=f1bccf58c5a2eaab0fbb8d60bb1185007eae0ee8;hb=5011cded16d15bb03c2f172ddae81499d764e28a;hp=4ea889740913c124e2b2af17871b5458208ca860;hpb=6985325e01c6b0b4a0b332dc066f2c00bc32503f;p=youtube-dl.git

diff --git a/test/test_download.py b/test/test_download.py
index 4ea889740..f1bccf58c 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import errno
 import hashlib
 import io
 import os
@@ -25,6 +26,15 @@ 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(10)
+
+def _try_rm(filename):
+    """ Remove a file if it exists """
+    try:
+        os.remove(filename)
+    except OSError as ose:
+        if ose.errno != errno.ENOENT:
+            raise
 
 class FileDownloader(youtube_dl.FileDownloader):
     def __init__(self, *args, **kwargs):
@@ -50,15 +60,6 @@ class TestDownload(unittest.TestCase):
         self.parameters = parameters
         self.defs = defs
 
-        # Clear old files
-        self.tearDown()
-
-    def tearDown(self):
-        for fn in [ test.get('file', False) for test in self.defs ]:
-            if fn and os.path.exists(fn):
-                os.remove(fn)
-
-
 ### Dynamically generate tests
 def generator(test_case):
 
@@ -67,34 +68,51 @@ def generator(test_case):
         if not ie._WORKING:
             print('Skipping: IE marked as not _WORKING')
             return
-        if not test_case['file']:
+        if 'playlist' not in test_case and not test_case['file']:
             print('Skipping: No output file specified')
             return
         if 'skip' in test_case:
             print('Skipping: {0}'.format(test_case['skip']))
             return
 
-        params = dict(self.parameters) # Duplicate it locally
-        for p in test_case.get('params', {}):
-            params[p] = test_case['params'][p]
+        params = self.parameters.copy()
+        params.update(test_case.get('params', {}))
 
         fd = FileDownloader(params)
         fd.add_info_extractor(ie())
         for ien in test_case.get('add_ie', []):
             fd.add_info_extractor(getattr(youtube_dl.InfoExtractors, ien + 'IE')())
-        fd.download([test_case['url']])
-
-        self.assertTrue(os.path.exists(test_case['file']))
-        if 'md5' in test_case:
-            md5_for_file = _file_md5(test_case['file'])
-            self.assertEqual(md5_for_file, test_case['md5'])
-        info_dict = fd.processed_info_dicts[0]
-        for (info_field, value) in test_case.get('info_dict', {}).items():
-            if value.startswith('md5:'):
-                md5_info_value = hashlib.md5(info_dict.get(info_field, '')).hexdigest()
-                self.assertEqual(value[3:], md5_info_value)
-            else:
-                self.assertEqual(value, info_dict.get(info_field))
+        finished_hook_called = set()
+        def _hook(status):
+            if status['status'] == 'finished':
+                finished_hook_called.add(status['filename'])
+        fd.add_progress_hook(_hook)
+
+        test_cases = test_case.get('playlist', [test_case])
+        for tc in test_cases:
+            _try_rm(tc['file'])
+            _try_rm(tc['file'] + '.part')
+            _try_rm(tc['file'] + '.info.json')
+        try:
+            fd.download([test_case['url']])
+
+            for tc in test_cases:
+                if not test_case.get('params', {}).get('skip_download', False):
+                    self.assertTrue(os.path.exists(tc['file']), msg='Missing file ' + tc['file'])
+                    self.assertTrue(tc['file'] in finished_hook_called)
+                self.assertTrue(os.path.exists(tc['file'] + '.info.json'))
+                if 'md5' in tc:
+                    md5_for_file = _file_md5(tc['file'])
+                    self.assertEqual(md5_for_file, tc['md5'])
+                with io.open(tc['file'] + '.info.json', encoding='utf-8') as infof:
+                    info_dict = json.load(infof)
+                for (info_field, value) in tc.get('info_dict', {}).items():
+                    self.assertEqual(value, info_dict.get(info_field))
+        finally:
+            for tc in test_cases:
+                _try_rm(tc['file'])
+                _try_rm(tc['file'] + '.part')
+                _try_rm(tc['file'] + '.info.json')
 
     return test_template