Merge branch 'main' into joseph/new-tokenless

codecov_cli/helpers/request.py

@@ -57,9 +57,9 @@ def wrapper(*args, **kwargs):
         while retry < MAX_RETRIES:
             try:
                 response = func(*args, **kwargs)
-                if response.status_code == 502:
+                if response.status_code >= 500:
                     logger.warning(
-                        "Response status code was 502.",
+                        f"Response status code was {response.status_code}.",
                         extra=dict(extra_log_attributes=dict(retry=retry)),
                     )
                     raise RetryException

tests/helpers/test_upload_sender.py

@@ -299,19 +299,21 @@ def test_upload_sender_result_fail_post_400(
 
         assert sender.warnings is not None
 
-    def test_upload_sender_result_fail_post_502(
-        self, mocker, mocked_responses, mocked_legacy_upload_endpoint, capsys
+
+    @pytest.mark.parametrize("error_code", [500, 502])
+    def test_upload_sender_result_fail_post_500s(
+        self, mocker, mocked_responses, mocked_legacy_upload_endpoint, capsys, error_code
     ):
         mocker.patch("codecov_cli.helpers.request.sleep")
-        mocked_legacy_upload_endpoint.status = 502
+        mocked_legacy_upload_endpoint.status = error_code
 
         with pytest.raises(Exception, match="Request failed after too many retries"):
             _ = UploadSender().send_upload_data(
                 upload_collection, random_sha, random_token, **named_upload_data
             )
 
         matcher = re.compile(
-            r"(warning.*((Response status code was 502)|(Request failed\. Retrying)).*(\n)?){6}"
+            rf"(warning.*((Response status code was {error_code})|(Request failed\. Retrying)).*(\n)?){{6}}"
         )
 
         assert matcher.match(capsys.readouterr().err) is not None