From 9ec0b0a8da2e5bb49257f3acc606c2c69fbf8e57 Mon Sep 17 00:00:00 2001
From: Nathan Spencer <natekspencer@gmail.com>
Date: Tue, 25 May 2021 12:15:37 -0600
Subject: [PATCH] Fix for invalid value error when using UI editor for
 Litter-Robot's set_wait_time service (#50269)

---
 .../components/litterrobot/entity.py          |  3 +-
 .../components/litterrobot/vacuum.py          |  2 +-
 tests/components/litterrobot/test_vacuum.py   | 30 +++++++++++--------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/homeassistant/components/litterrobot/entity.py b/homeassistant/components/litterrobot/entity.py
index 015e781c38a..d75207fb80d 100644
--- a/homeassistant/components/litterrobot/entity.py
+++ b/homeassistant/components/litterrobot/entity.py
@@ -69,7 +69,8 @@ class LitterRobotControlEntity(LitterRobotEntity):
 
         try:
             await action(*args, **kwargs)
-        except InvalidCommandException as ex:
+        except InvalidCommandException as ex:  # pragma: no cover
+            # this exception should only occur if the underlying API for commands changes
             _LOGGER.error(ex)
             return False
 
diff --git a/homeassistant/components/litterrobot/vacuum.py b/homeassistant/components/litterrobot/vacuum.py
index bd5fb9b92df..2cfe104c753 100644
--- a/homeassistant/components/litterrobot/vacuum.py
+++ b/homeassistant/components/litterrobot/vacuum.py
@@ -71,7 +71,7 @@ async def async_setup_entry(
     )
     platform.async_register_entity_service(
         SERVICE_SET_WAIT_TIME,
-        {vol.Required("minutes"): vol.In(VALID_WAIT_TIMES)},
+        {vol.Required("minutes"): vol.All(vol.Coerce(int), vol.In(VALID_WAIT_TIMES))},
         "async_set_wait_time",
     )
 
diff --git a/tests/components/litterrobot/test_vacuum.py b/tests/components/litterrobot/test_vacuum.py
index 67c526e4a30..7db0ca5dde4 100644
--- a/tests/components/litterrobot/test_vacuum.py
+++ b/tests/components/litterrobot/test_vacuum.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 
 import pytest
+from voluptuous.error import MultipleInvalid
 
 from homeassistant.components.litterrobot import DOMAIN
 from homeassistant.components.litterrobot.entity import REFRESH_WAIT_TIME_SECONDS
@@ -92,6 +93,11 @@ async def test_vacuum_with_error(hass: HomeAssistant, mock_account_with_error):
             "set_wait_time",
             {"minutes": 3},
         ),
+        (
+            SERVICE_SET_WAIT_TIME,
+            "set_wait_time",
+            {"minutes": "15"},
+        ),
     ],
 )
 async def test_commands(hass: HomeAssistant, mock_account, service, command, extra):
@@ -117,21 +123,19 @@ async def test_commands(hass: HomeAssistant, mock_account, service, command, ext
     getattr(mock_account.robots[0], command).assert_called_once()
 
 
-async def test_invalid_commands(
-    hass: HomeAssistant, caplog, mock_account_with_side_effects
-):
-    """Test sending invalid commands to the vacuum."""
-    await setup_integration(hass, mock_account_with_side_effects, PLATFORM_DOMAIN)
+async def test_invalid_wait_time(hass: HomeAssistant, mock_account):
+    """Test an attempt to send an invalid wait time to the vacuum."""
+    await setup_integration(hass, mock_account, PLATFORM_DOMAIN)
 
     vacuum = hass.states.get(VACUUM_ENTITY_ID)
     assert vacuum
     assert vacuum.state == STATE_DOCKED
 
-    await hass.services.async_call(
-        DOMAIN,
-        SERVICE_SET_WAIT_TIME,
-        {ATTR_ENTITY_ID: VACUUM_ENTITY_ID, "minutes": 15},
-        blocking=True,
-    )
-    mock_account_with_side_effects.robots[0].set_wait_time.assert_called_once()
-    assert "Invalid command: oops" in caplog.text
+    with pytest.raises(MultipleInvalid):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SET_WAIT_TIME,
+            {ATTR_ENTITY_ID: VACUUM_ENTITY_ID, "minutes": 10},
+            blocking=True,
+        )
+    assert not mock_account.robots[0].set_wait_time.called