X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=test%2Ftest_download.py;h=2b8ac69754502457ea2e09aa026f3eceaee732f4;hb=cc7fec5818254f4679896823c7de9d17f50201ca;hp=167c1cf958e0ae8efcb32b19e1943c399c0b494d;hpb=2857084000f7b8471b63759e4a5bb3bce5327cc2;p=youtube-dl

diff --git a/test/test_download.py b/test/test_download.py
index 167c1cf95..2b8ac6975 100644
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -28,6 +28,7 @@ from youtube_dl.utils import (
     compat_HTTPError,
     DownloadError,
     ExtractorError,
+    format_bytes,
     UnavailableVideoError,
 )
 from youtube_dl.extractor import get_info_extractor
@@ -152,9 +153,10 @@ def generator(test_case):
                     len(res_dict['entries']),
                     test_case['playlist_count'],
                     'Expected %d entries in playlist %s, but got %d.' % (
-                        len(res_dict['entries']),
+                        test_case['playlist_count'],
                         test_case['url'],
-                        test_case['playlist_count']))
+                        len(res_dict['entries']),
+                    ))
             if 'playlist_duration_sum' in test_case:
                 got_duration = sum(e['duration'] for e in res_dict['entries'])
                 self.assertEqual(
@@ -165,11 +167,21 @@ def generator(test_case):
                 if not test_case.get('params', {}).get('skip_download', False):
                     self.assertTrue(os.path.exists(tc_filename), msg='Missing file ' + tc_filename)
                     self.assertTrue(tc_filename in finished_hook_called)
+                    expected_minsize = tc.get('file_minsize', 10000)
+                    if expected_minsize is not None:
+                        if params.get('test'):
+                            expected_minsize = max(expected_minsize, 10000)
+                        got_fsize = os.path.getsize(tc_filename)
+                        assertGreaterEqual(
+                            self, got_fsize, expected_minsize,
+                            'Expected %s to be at least %s, but it\'s only %s ' %
+                            (tc_filename, format_bytes(expected_minsize),
+                                format_bytes(got_fsize)))
+                    if 'md5' in tc:
+                        md5_for_file = _file_md5(tc_filename)
+                        self.assertEqual(md5_for_file, tc['md5'])
                 info_json_fn = os.path.splitext(tc_filename)[0] + '.info.json'
                 self.assertTrue(os.path.exists(info_json_fn))
-                if 'md5' in tc:
-                    md5_for_file = _file_md5(tc_filename)
-                    self.assertEqual(md5_for_file, tc['md5'])
                 with io.open(info_json_fn, encoding='utf-8') as infof:
                     info_dict = json.load(infof)