remove timeout config

homeassistant/components/samsungtv/__init__.py

@@ -8,11 +8,10 @@ from homeassistant.const import (
     CONF_MAC,
     CONF_NAME,
     CONF_PORT,
-    CONF_TIMEOUT,
 )
 import homeassistant.helpers.config_validation as cv
 
-from .const import DEFAULT_NAME, DEFAULT_TIMEOUT, DOMAIN
+from .const import DEFAULT_NAME, DOMAIN
 
 CONFIG_SCHEMA = vol.Schema(
     {
@@ -24,9 +23,6 @@ CONFIG_SCHEMA = vol.Schema(
                         vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
                         vol.Optional(CONF_PORT): cv.port,
                         vol.Optional(CONF_MAC): cv.string,
-                        vol.Optional(
-                            CONF_TIMEOUT, default=DEFAULT_TIMEOUT
-                        ): cv.positive_int,
                         vol.Optional(
                             CONF_BROADCAST_ADDRESS, default=BROADCAST_IP
                         ): cv.string,

homeassistant/components/samsungtv/config_flow.py

@@ -21,7 +21,6 @@ from homeassistant.const import (
     CONF_MAC,
     CONF_NAME,
     CONF_PORT,
-    CONF_TIMEOUT,
 )
 
 from .const import CONF_MANUFACTURER, CONF_MODEL, DOMAIN, LOGGER, METHODS
@@ -99,7 +98,6 @@ class SamsungTVConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         self._model = None
         self._name = None
         self._port = None
-        self._timeout = None
         self._title = None
         self._uuid = None
 
@@ -116,7 +114,6 @@ class SamsungTVConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                 CONF_MODEL: self._model,
                 CONF_NAME: self._name,
                 CONF_PORT: self._port,
-                CONF_TIMEOUT: self._timeout,
             },
         )
 
@@ -142,7 +139,6 @@ class SamsungTVConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             self._ip = self.context[CONF_IP_ADDRESS] = ip_address
             self._mac = user_input.get(CONF_MAC)
             self._port = user_input.get(CONF_PORT)
-            self._timeout = user_input.get(CONF_TIMEOUT)
             self._title = user_input.get(CONF_NAME)
 
             result = await self.hass.async_add_executor_job(

homeassistant/components/samsungtv/const.py

@@ -5,7 +5,6 @@ LOGGER = logging.getLogger(__package__)
 DOMAIN = "samsungtv"
 
 DEFAULT_NAME = "Samsung TV Remote"
-DEFAULT_TIMEOUT = 1
 
 CONF_MANUFACTURER = "manufacturer"
 CONF_MODEL = "model"

homeassistant/components/samsungtv/media_player.py

@@ -27,7 +27,6 @@ from homeassistant.const import (
     CONF_ID,
     CONF_MAC,
     CONF_PORT,
-    CONF_TIMEOUT,
     STATE_OFF,
     STATE_ON,
 )
@@ -68,13 +67,12 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     model = config_entry.data.get(CONF_MODEL)
     name = config_entry.title
     port = config_entry.data.get(CONF_PORT)
-    timeout = config_entry.data.get(CONF_TIMEOUT)
     uuid = config_entry.data.get(CONF_ID)
 
     async_add_entities(
         [
             SamsungTVDevice(
-                host, port, name, timeout, mac, broadcast, uuid, manufacturer, model
+                host, port, name, mac, broadcast, uuid, manufacturer, model
             )
         ]
     )
@@ -88,7 +86,6 @@ class SamsungTVDevice(MediaPlayerDevice):
         host,
         port,
         name,
-        timeout,
         mac,
         broadcast,
         uuid,
@@ -120,7 +117,7 @@ class SamsungTVDevice(MediaPlayerDevice):
             "method": None,
             "port": port,
             "host": host,
-            "timeout": timeout,
+            "timeout": None,
         }
 
         # Select method by port number, mainly for fallback

tests/components/samsungtv/test_init.py

@@ -15,7 +15,6 @@ from homeassistant.const import (
     CONF_MAC,
     CONF_NAME,
     CONF_PORT,
-    CONF_TIMEOUT,
     SERVICE_VOLUME_UP,
 )
 
@@ -28,7 +27,6 @@ MOCK_CONFIG = {
             CONF_MAC: "fake_mac",
             CONF_NAME: "fake_name",
             CONF_PORT: 1234,
-            CONF_TIMEOUT: 999,
         }
     ]
 }
@@ -39,7 +37,7 @@ REMOTE_CALL = {
     "method": "websocket",
     "port": MOCK_CONFIG[SAMSUNGTV_DOMAIN][0][CONF_PORT],
     "host": MOCK_CONFIG[SAMSUNGTV_DOMAIN][0][CONF_HOST],
-    "timeout": MOCK_CONFIG[SAMSUNGTV_DOMAIN][0][CONF_TIMEOUT],
+    "timeout": None,
 }
 
 
@@ -65,7 +63,7 @@ async def test_setup(hass, remote):
         state.attributes[ATTR_SUPPORTED_FEATURES] == SUPPORT_SAMSUNGTV | SUPPORT_TURN_ON
     )
 
-    # test host, port and timeout
+    # test host and port
     assert await hass.services.async_call(
         DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )

tests/components/samsungtv/test_media_player.py

@@ -23,14 +23,8 @@ from homeassistant.components.media_player.const import (
     SERVICE_SELECT_SOURCE,
     SUPPORT_TURN_ON,
 )
-from homeassistant.components.samsungtv.const import (
+from homeassistant.components.samsungtv.const import DOMAIN as SAMSUNGTV_DOMAIN
-    DEFAULT_TIMEOUT,
+from homeassistant.components.samsungtv.media_player import SUPPORT_SAMSUNGTV
-    DOMAIN as SAMSUNGTV_DOMAIN,
-)
-from homeassistant.components.samsungtv.media_player import (
-    CONF_TIMEOUT,
-    SUPPORT_SAMSUNGTV,
-)
 from homeassistant.const import (
     ATTR_DEVICE_CLASS,
     ATTR_ENTITY_ID,
@@ -66,7 +60,6 @@ MOCK_CONFIG = {
             CONF_HOST: "fake",
             CONF_NAME: "fake",
             CONF_PORT: 8001,
-            CONF_TIMEOUT: 10,
             CONF_MAC: "38:f9:d3:82:b4:f1",
         }
     ]
@@ -79,7 +72,6 @@ MOCK_CONFIG_BROADCAST = {
             CONF_HOST: "fake_broadcast",
             CONF_NAME: "fake_broadcast",
             CONF_PORT: 8001,
-            CONF_TIMEOUT: 10,
             CONF_MAC: "38:f9:d3:82:b4:f1",
             CONF_BROADCAST_ADDRESS: "192.168.5.255",
         }
@@ -93,7 +85,6 @@ MOCK_CONFIG_NOMAC = {
             CONF_HOST: "fake_nomac",
             CONF_NAME: "fake_nomac",
             CONF_PORT: 55000,
-            CONF_TIMEOUT: 10,
         }
     ]
 }
@@ -134,7 +125,7 @@ AUTODETECT_WEBSOCKET = {
     "method": "websocket",
     "port": None,
     "host": "fake_auto",
-    "timeout": DEFAULT_TIMEOUT,
+    "timeout": None,
 }
 AUTODETECT_LEGACY = {
     "name": "HomeAssistant",
@@ -143,7 +134,7 @@ AUTODETECT_LEGACY = {
     "method": "legacy",
     "port": None,
     "host": "fake_auto",
-    "timeout": DEFAULT_TIMEOUT,
+    "timeout": None,
 }