From 672db9cfe9852108ae2bd1a946c287bfec5345d4 Mon Sep 17 00:00:00 2001
From: Robert Van Gorkom <vangorra@users.noreply.github.com>
Date: Sat, 11 Jan 2020 17:58:06 -0800
Subject: [PATCH] Fixing unit of measure for withings hydration. Fixes #30570
 (#30685)

---
 homeassistant/components/withings/sensor.py |  6 ++-
 tests/components/withings/test_common.py    | 42 +++++++++------------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/homeassistant/components/withings/sensor.py b/homeassistant/components/withings/sensor.py
index 0bb7be16f8e..ea570569fa6 100644
--- a/homeassistant/components/withings/sensor.py
+++ b/homeassistant/components/withings/sensor.py
@@ -177,7 +177,11 @@ WITHINGS_ATTRIBUTES = [
         const.MEAS_SPO2_PCT, MeasureType.SP02, "SP02", const.UOM_PERCENT, None
     ),
     WithingsMeasureAttribute(
-        const.MEAS_HYDRATION, MeasureType.HYDRATION, "Hydration", "", "mdi:water"
+        const.MEAS_HYDRATION,
+        MeasureType.HYDRATION,
+        "Hydration",
+        const.UOM_PERCENT,
+        "mdi:water",
     ),
     WithingsMeasureAttribute(
         const.MEAS_PWV,
diff --git a/tests/components/withings/test_common.py b/tests/components/withings/test_common.py
index acb69dddf4e..4a48dcee571 100644
--- a/tests/components/withings/test_common.py
+++ b/tests/components/withings/test_common.py
@@ -11,7 +11,6 @@ from homeassistant.components.withings.common import (
     NotAuthenticatedError,
     WithingsDataManager,
 )
-from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.util import dt
 
@@ -27,17 +26,6 @@ def withings_api_fixture() -> WithingsApi:
     return withings_api
 
 
-@pytest.fixture
-def mock_time_zone():
-    """Provide an alternative time zone."""
-    patch_time_zone = patch(
-        "homeassistant.util.dt.DEFAULT_TIME_ZONE",
-        new=dt.get_time_zone("America/Los_Angeles"),
-    )
-    with patch_time_zone:
-        yield
-
-
 @pytest.fixture(name="data_manager")
 def data_manager_fixture(hass, withings_api: WithingsApi) -> WithingsDataManager:
     """Provide data manager."""
@@ -122,20 +110,26 @@ async def test_data_manager_call_throttle_disabled(
 
 
 async def test_data_manager_update_sleep_date_range(
-    hass: HomeAssistant, data_manager: WithingsDataManager, mock_time_zone
+    data_manager: WithingsDataManager,
 ) -> None:
     """Test method."""
-    update_start_time = dt.now()
-    await data_manager.update_sleep()
+    patch_time_zone = patch(
+        "homeassistant.util.dt.DEFAULT_TIME_ZONE",
+        new=dt.get_time_zone("America/Los_Angeles"),
+    )
 
-    call_args = data_manager.api.sleep_get.call_args_list[0][1]
-    startdate = call_args.get("startdate")
-    enddate = call_args.get("enddate")
+    with patch_time_zone:
+        update_start_time = dt.now()
+        await data_manager.update_sleep()
 
-    assert startdate.tzname() == "PST"
+        call_args = data_manager.api.sleep_get.call_args_list[0][1]
+        startdate = call_args.get("startdate")
+        enddate = call_args.get("enddate")
 
-    assert enddate.tzname() == "PST"
-    assert startdate.tzname() == "PST"
-    assert update_start_time < enddate
-    assert enddate < update_start_time + timedelta(seconds=1)
-    assert enddate > startdate
+        assert startdate.tzname() == "PST"
+
+        assert enddate.tzname() == "PST"
+        assert startdate.tzname() == "PST"
+        assert update_start_time < enddate
+        assert enddate < update_start_time + timedelta(seconds=1)
+        assert enddate > startdate