Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rsconnect/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ def upload_bundle(
response = cast(
Union[BundleMetadata, HTTPResponse], self.post(f"v1/content/{content_guid}/bundles", body=tarball)
)
response = self._server.handle_bad_response(response)
response = self._server.handle_bad_response(response)
return response

def content_update(self, content_guid: str, updates: Mapping[str, str | None]) -> ContentItemV1:
Expand Down
19 changes: 19 additions & 0 deletions tests/test_git_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,3 +266,22 @@ def test_upload_bundle_signature_accepts_metadata(self):
# Check that upload_bundle has metadata parameter
sig = signature(RSConnectClient.upload_bundle)
assert "metadata" in sig.parameters

def test_upload_bundle_with_metadata_handles_bad_response(self):
"""A bad response on the multipart (metadata) upload path is surfaced as an
RSConnectException rather than a raw HTTPResponse (issue #814)."""
import io
from unittest.mock import patch

from rsconnect.api import RSConnectClient, RSConnectException, RSConnectServer
from rsconnect.http_support import HTTPResponse

client = RSConnectClient(RSConnectServer("http://test-server", "api_key"))
bad_response = HTTPResponse(
"http://test-server/__api__/v1/content/guid/bundles",
exception=OSError("connection refused"),
)
with patch.object(RSConnectClient, "post", return_value=bad_response):
with pytest.raises(RSConnectException) as cm:
client.upload_bundle("guid", io.BytesIO(b"tarball"), metadata={"source": "git"})
assert "connection refused" in str(cm.value)
Loading