Support direct vimeo links (Closes #666)

[youtube-dl] / test / test_download.py

diff --git a/test/test_download.py b/test/test_download.py
index 128ff9ae4fb7364a3f1ce0f77d4e6fa3724d85ab..f1bccf58c5a2eaab0fbb8d60bb1185007eae0ee8 100644 (file)
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -26,6 +26,7 @@ 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 """
@@ -74,24 +75,31 @@ def generator(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')())
+        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:
-                self.assertTrue(os.path.exists(tc['file']))
+                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'])
@@ -99,14 +107,11 @@ def generator(test_case):
                 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():
-                    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))
+                    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