From 12f964ca57f2e56dbb4a9cfb8411a36ac14466f9 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 22 Aug 2019 00:54:04 +0200 Subject: [PATCH] Statistics sensors repect given name (#26119) --- homeassistant/components/statistics/sensor.py | 5 +---- tests/components/statistics/test_sensor.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/homeassistant/components/statistics/sensor.py b/homeassistant/components/statistics/sensor.py index 252a29591c9..51868c6d0a8 100644 --- a/homeassistant/components/statistics/sensor.py +++ b/homeassistant/components/statistics/sensor.py @@ -82,10 +82,7 @@ class StatisticsSensor(Entity): """Initialize the Statistics sensor.""" self._entity_id = entity_id self.is_binary = self._entity_id.split(".")[0] == "binary_sensor" - if not self.is_binary: - self._name = "{} {}".format(name, ATTR_MEAN) - else: - self._name = "{} {}".format(name, ATTR_COUNT) + self._name = name self._sampling_size = sampling_size self._max_age = max_age self._precision = precision diff --git a/tests/components/statistics/test_sensor.py b/tests/components/statistics/test_sensor.py index 32aa2d56558..2a28876f552 100644 --- a/tests/components/statistics/test_sensor.py +++ b/tests/components/statistics/test_sensor.py @@ -60,7 +60,7 @@ class TestStatisticsSensor(unittest.TestCase): self.hass.states.set("binary_sensor.test_monitored", value) self.hass.block_till_done() - state = self.hass.states.get("sensor.test_count") + state = self.hass.states.get("sensor.test") assert str(len(values)) == state.state @@ -87,7 +87,7 @@ class TestStatisticsSensor(unittest.TestCase): ) self.hass.block_till_done() - state = self.hass.states.get("sensor.test_mean") + state = self.hass.states.get("sensor.test") assert str(self.mean) == state.state assert self.min == state.attributes.get("min_value") @@ -126,7 +126,7 @@ class TestStatisticsSensor(unittest.TestCase): ) self.hass.block_till_done() - state = self.hass.states.get("sensor.test_mean") + state = self.hass.states.get("sensor.test") assert 3.8 == state.attributes.get("min_value") assert 14 == state.attributes.get("max_value") @@ -155,7 +155,7 @@ class TestStatisticsSensor(unittest.TestCase): ) self.hass.block_till_done() - state = self.hass.states.get("sensor.test_mean") + state = self.hass.states.get("sensor.test") # require only one data point assert self.values[-1] == state.attributes.get("min_value") @@ -206,7 +206,7 @@ class TestStatisticsSensor(unittest.TestCase): # insert the next value one minute later mock_data["return_time"] += timedelta(minutes=1) - state = self.hass.states.get("sensor.test_mean") + state = self.hass.states.get("sensor.test") assert 6 == state.attributes.get("min_value") assert 14 == state.attributes.get("max_value") @@ -248,7 +248,7 @@ class TestStatisticsSensor(unittest.TestCase): # insert the next value one minute later mock_data["return_time"] += timedelta(minutes=1) - state = self.hass.states.get("sensor.test_mean") + state = self.hass.states.get("sensor.test") assert datetime( 2017, 8, 2, 12, 23, 42, tzinfo=dt_util.UTC @@ -290,7 +290,7 @@ class TestStatisticsSensor(unittest.TestCase): self.hass.block_till_done() # check if the result is as in test_sensor_source() - state = self.hass.states.get("sensor.test_mean") + state = self.hass.states.get("sensor.test") assert str(self.mean) == state.state @pytest.mark.skip("Flaky in CI") @@ -355,7 +355,7 @@ class TestStatisticsSensor(unittest.TestCase): self.hass.block_till_done() # check if the result is as in test_sensor_source() - state = self.hass.states.get("sensor.test_mean") + state = self.hass.states.get("sensor.test") assert expected_min_age == state.attributes.get("min_age") # The max_age timestamp should be 1 hour before what we have right