diff options
| author | Sergey M․ <dstftw@gmail.com> | 2014-08-29 18:42:42 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2014-08-29 18:42:42 +0700 |
| commit | 08a36c35693d212405a50b490f7f1828830e60ee (patch) | |
| tree | d05351227d93648953ef7fe09203b3b75d65f4e1 | |
| parent | 37709fae8990b6d44383bb6763d8829bd33469b9 (diff) | |
[test_download] Check expected file minsize and md5 only when download is not skipped
| -rw-r--r-- | test/test_download.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/test/test_download.py b/test/test_download.py index 9845ba8c6..2b8ac6975 100644 --- a/test/test_download.py +++ b/test/test_download.py @@ -167,21 +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']) - 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))) with io.open(info_json_fn, encoding='utf-8') as infof: info_dict = json.load(infof) |