Skip to content

Guard against empty ssdp locations #43156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 1 commit into from
Nov 13, 2020
+6 −2
Merged

Guard against empty ssdp locations #43156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion homeassistant/components/ssdp/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ async def _process_entries(self, entries):

entries_to_process.append(entry)

if entry.location not in self._description_cache:
if (
entry.location is not None
and entry.location not in self._description_cache
):
unseen_locations.add(entry.location)

if not entries_to_process:
Expand Down
3 changes: 2 additions & 1 deletion tests/components/ssdp/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from tests.common import mock_coro


async def test_scan_match_st(hass):
async def test_scan_match_st(hass, caplog):
"""Test matching based on ST."""
scanner = ssdp.Scanner(hass, {"mock-domain": [{"st": "mock-st"}]})

Expand Down Expand Up @@ -38,6 +38,7 @@ async def test_scan_match_st(hass):
ssdp.ATTR_SSDP_SERVER: "mock-server",
ssdp.ATTR_SSDP_EXT: "",
}
assert "Failed to fetch ssdp data" not in caplog.text


@pytest.mark.parametrize(
Expand Down