]> jfr.im git - yt-dlp.git/commitdiff
Update to ytdl-commit-e6a836d
authorpukkandan <redacted>
Sun, 14 Aug 2022 21:52:57 +0000 (03:22 +0530)
committerpukkandan <redacted>
Sun, 14 Aug 2022 22:01:48 +0000 (03:31 +0530)
[core] Make `--max-downloads ...` stop immediately on reaching the limit
https://github.com/ytdl-org/youtube-dl/commit/e6a836d54ca1d3cd02f3ee45ef707a46f23e8291

test/test_download.py

index 787013c3422102420896d1e9f1fa59b128125c77..ee53efa1c4f9f8b20f1ad480e4f59028948188dc 100755 (executable)
@@ -105,11 +105,11 @@ def print_skipping(reason):
             info_dict = tc.get('info_dict', {})
             params = tc.get('params', {})
             if not info_dict.get('id'):
-                raise Exception('Test definition incorrect. \'id\' key is not present')
+                raise Exception(f'Test {tname} definition incorrect - "id" key is not present')
             elif not info_dict.get('ext'):
                 if params.get('skip_download') and params.get('ignore_no_formats_error'):
                     continue
-                raise Exception('Test definition incorrect. The output file cannot be known. \'ext\' key is not present')
+                raise Exception(f'Test {tname} definition incorrect - "ext" key must be present to define the output file')
 
         if 'skip' in test_case:
             print_skipping(test_case['skip'])
@@ -161,7 +161,9 @@ def try_rm_tcs_files(tcs=None):
                         force_generic_extractor=params.get('force_generic_extractor', False))
                 except (DownloadError, ExtractorError) as err:
                     # Check if the exception is not a network related one
-                    if not err.exc_info[0] in (urllib.error.URLError, socket.timeout, UnavailableVideoError, http.client.BadStatusLine) or (err.exc_info[0] == urllib.error.HTTPError and err.exc_info[1].code == 503):
+                    if (err.exc_info[0] not in (urllib.error.URLError, socket.timeout, UnavailableVideoError, http.client.BadStatusLine)
+                            or (err.exc_info[0] == urllib.error.HTTPError and err.exc_info[1].code == 503)):
+                        err.msg = f'{getattr(err, "msg", err)} ({tname})'
                         raise
 
                     if try_num == RETRIES: