Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix upload service response for google_photos (#136106)

pull/135883/head^2
Sid 2025-01-20 20:00:02 +01:00 committed by GitHub
parent e7a635abc8
commit 4c008a5cb5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/google_photos/services.py
View File

@ -144,11 +144,9 @@ def async_register_services(hass: HomeAssistant) -> None:
if call.return_response:
return {
"media_items": [
{
"media_item_id": item_result.media_item.id
for item_result in upload_result.new_media_item_results
if item_result.media_item and item_result.media_item.id
}
{"media_item_id": item_result.media_item.id}
for item_result in upload_result.new_media_item_results
if item_result.media_item and item_result.media_item.id
],
"album_id": album_id,
}

51
tests/components/google_photos/test_services.py
View File

@ -74,24 +74,55 @@ def mock_upload_file(
yield
@pytest.mark.parametrize(
("media_items_result", "service_response"),
[
(
CreateMediaItemsResult(
new_media_item_results=[
NewMediaItemResult(
upload_token="some-upload-token",
status=Status(code=200),
media_item=MediaItem(id="new-media-item-id-1"),
)
]
),
[{"media_item_id": "new-media-item-id-1"}],
),
(
CreateMediaItemsResult(
new_media_item_results=[
NewMediaItemResult(
upload_token="some-upload-token",
status=Status(code=200),
media_item=MediaItem(id="new-media-item-id-1"),
),
NewMediaItemResult(
upload_token="some-upload-token",
status=Status(code=200),
media_item=MediaItem(id="new-media-item-id-2"),
),
]
),
[
{"media_item_id": "new-media-item-id-1"},
{"media_item_id": "new-media-item-id-2"},
],
),
],
)
@pytest.mark.usefixtures("setup_integration")
async def test_upload_service(
hass: HomeAssistant,
config_entry: MockConfigEntry,
mock_api: Mock,
media_items_result: CreateMediaItemsResult,
service_response: list[dict[str, str]],
) -> None:
"""Test service call to upload content."""
assert hass.services.has_service(DOMAIN, "upload")
mock_api.create_media_items.return_value = CreateMediaItemsResult(
new_media_item_results=[
NewMediaItemResult(
upload_token="some-upload-token",
status=Status(code=200),
media_item=MediaItem(id="new-media-item-id-1"),
)
]
)
mock_api.create_media_items.return_value = media_items_result
response = await hass.services.async_call(
DOMAIN,
@ -106,7 +137,7 @@ async def test_upload_service(
)
assert response == {
"media_items": [{"media_item_id": "new-media-item-id-1"}],
"media_items": service_response,
"album_id": "album-media-id-1",
}