From 1dc5fa145f8f4f5ff9887e2e53507e0b99bf027f Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Sun, 11 Mar 2018 20:42:58 +0100 Subject: [PATCH] Revert "Cast automatically drop connection (#12635)" (#13094) This reverts commit e14893416fb98d3ef9a37d816e0ee719105b33a1. --- homeassistant/components/media_player/cast.py | 9 +++------ tests/components/media_player/test_cast.py | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/homeassistant/components/media_player/cast.py b/homeassistant/components/media_player/cast.py index dbcb53ec185..579f9b62864 100644 --- a/homeassistant/components/media_player/cast.py +++ b/homeassistant/components/media_player/cast.py @@ -7,7 +7,6 @@ https://home-assistant.io/components/media_player.cast/ # pylint: disable=import-error import logging import threading -import functools import voluptuous as vol @@ -35,7 +34,6 @@ CONF_IGNORE_CEC = 'ignore_cec' CAST_SPLASH = 'https://home-assistant.io/images/cast/splash.png' DEFAULT_PORT = 8009 -SOCKET_CLIENT_RETRIES = 10 SUPPORT_CAST = SUPPORT_PAUSE | SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | \ SUPPORT_TURN_ON | SUPPORT_TURN_OFF | SUPPORT_PREVIOUS_TRACK | \ @@ -78,7 +76,7 @@ def _setup_internal_discovery(hass: HomeAssistantType) -> None: try: # pylint: disable=protected-access chromecast = pychromecast._get_chromecast_from_host( - mdns, blocking=True, tries=SOCKET_CLIENT_RETRIES) + mdns, blocking=True) except pychromecast.ChromecastConnectionError: _LOGGER.debug("Can't set up cast with mDNS info %s. " "Assuming it's not a Chromecast", mdns) @@ -183,9 +181,8 @@ async def async_setup_platform(hass: HomeAssistantType, config: ConfigType, else: # Manually add a "normal" Chromecast, we can do that without discovery. try: - func = functools.partial(pychromecast.Chromecast, *want_host, - tries=SOCKET_CLIENT_RETRIES) - chromecast = await hass.async_add_job(func) + chromecast = await hass.async_add_job( + pychromecast.Chromecast, *want_host) except pychromecast.ChromecastConnectionError as err: _LOGGER.warning("Can't set up chromecast on %s: %s", want_host[0], err) diff --git a/tests/components/media_player/test_cast.py b/tests/components/media_player/test_cast.py index aaaad47d8dc..2075b4cf6e6 100644 --- a/tests/components/media_player/test_cast.py +++ b/tests/components/media_player/test_cast.py @@ -123,7 +123,7 @@ def test_internal_discovery_callback_only_generates_once(hass): return_value=chromecast) as gen_chromecast: discover_cast('the-service', chromecast) mdns = (chromecast.host, chromecast.port, chromecast.uuid, None, None) - gen_chromecast.assert_called_once_with(mdns, blocking=True, tries=10) + gen_chromecast.assert_called_once_with(mdns, blocking=True) discover_cast('the-service', chromecast) gen_chromecast.reset_mock()