@@ -676,14 +676,15 @@ def test_artifact_archive_retry_and_duplicates(self):
676676 archive .writestr ('ready.json' , json .dumps (record ))
677677 item = dict (name = 'ready' , id = 1 , expired = False , archive_download_url = 'https://attacker.invalid' )
678678 listing = json .dumps (dict (artifacts = [item ], total_count = 1 )).encode ()
679- responses = [(listing , {'ETag' : 'v1' }), network .NetworkError ('Not ready' , 404 ),
679+ responses = [(listing , {'ETag' : 'v1' }), network .NetworkError ('Connection failed' , retryable = True ),
680+ network .NetworkError ('Not modified' , 304 ), network .NetworkError ('Not ready' , 404 ),
680681 network .NetworkError ('Not modified' , 304 ), (buffer .getvalue (), {})]
681682 with patch .object (network , 'fetch' , side_effect = responses ) as fetch , patch .object (time , 'sleep' ):
682683 value = network .download_records ('123' , {'ready' : 'linux' })
683684 self .assertEqual (value ['linux' ][0 ], record )
684685 self .assertEqual (fetch .call_args_list [2 ][1 ]['headers' ], {'If-None-Match' : 'v1' })
685686 self .assertEqual (fetch .call_args [0 ][0 ], 'https://api.github.com/repos/RsyncProject/rsync/actions/artifacts/1/zip' )
686- for code in (401 , 403 , 500 ):
687+ for code in (None , 401 , 403 , 500 ):
687688 with self .subTest (code = code ), patch .object (network , 'fetch' , side_effect = [(listing , {}), network .NetworkError ('Failed' , code )]), patch .object (time , 'sleep' ) as sleep :
688689 with self .assertRaises (network .NetworkError ):
689690 network .download_records ('123' , {'ready' : 'linux' })
@@ -692,6 +693,20 @@ def test_artifact_archive_retry_and_duplicates(self):
692693 with patch .object (network , 'fetch' , return_value = (duplicate , {})), self .assertRaisesRegex (network .NetworkError , 'Duplicate' ):
693694 network .download_records ('123' , {'ready' : 'linux' })
694695
696+ def test_artifact_listing_retries_connection_failures (self ):
697+ record = dict (self .state , role = 'linux' )
698+ buffer = io .BytesIO ()
699+ with zipfile .ZipFile (buffer , 'w' ) as archive :
700+ archive .writestr ('ready.json' , json .dumps (record ))
701+ item = dict (name = 'ready' , id = 1 , expired = False )
702+ listing = json .dumps (dict (artifacts = [item ], total_count = 1 )).encode ()
703+ responses = [network .NetworkError ('Connection failed' , retryable = True ),
704+ (listing , {}), (buffer .getvalue (), {})]
705+ with patch .object (network , 'fetch' , side_effect = responses ), patch .object (time , 'sleep' ) as sleep :
706+ value = network .download_records ('123' , {'ready' : 'linux' })
707+ self .assertEqual (value ['linux' ][0 ], record )
708+ sleep .assert_called_once_with (5 )
709+
695710 def test_redacted_http_errors (self ):
696711 class Opener :
697712 def open (self , * args , ** kwargs ):
@@ -705,6 +720,16 @@ def open(self, *args, **kwargs):
705720 with self .assertRaisesRegex (network .NetworkError , 'Worker acl access probe: HTTP 403' ):
706721 network .fetch ('https://example.test' , 'fixture-bearer' , operation = 'Worker acl access probe' )
707722
723+ def test_connection_errors_are_retryable (self ):
724+ class Opener :
725+ def open (self , * args , ** kwargs ):
726+ raise urllib .error .URLError ('fixture connection failure' )
727+ with patch .object (network .urllib .request , 'build_opener' , return_value = Opener ()), \
728+ self .assertRaises (network .NetworkError ) as caught :
729+ network .fetch ('https://example.test' , 'fixture-bearer' )
730+ self .assertTrue (caught .exception .retryable )
731+ self .assertEqual (str (caught .exception ), 'Network request: connection failed' )
732+
708733 def test_artifact_redirect_drops_authorisation (self ):
709734 requests = []
710735 class Response :
0 commit comments