Skip to content

Commit 41f33a1

Browse files
Bre77Bre77
authored
Fix history startup failures (#151439)
1 parent cf31401 commit 41f33a1

File tree

3 files changed

+36
-29
lines changed

3 files changed

+36
-29
lines changed

‎homeassistant/components/tesla_fleet/__init__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ async def _refresh_token() -> str:
179179
)
180180

181181
await live_coordinator.async_config_entry_first_refresh()
182-
await history_coordinator.async_config_entry_first_refresh()
183182
await info_coordinator.async_config_entry_first_refresh()
184183

185184
# Create energy site model

‎tests/components/tesla_fleet/snapshots/test_sensor.ambr‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
'last_changed': <ANY>,
5656
'last_reported': <ANY>,
5757
'last_updated': <ANY>,
58-
'state': '0.0',
58+
'state': 'unknown',
5959
})
6060
# ---
6161
# name: test_sensors[sensor.energy_site_battery_charged-statealt]
@@ -130,7 +130,7 @@
130130
'last_changed': <ANY>,
131131
'last_reported': <ANY>,
132132
'last_updated': <ANY>,
133-
'state': '0.0',
133+
'state': 'unknown',
134134
})
135135
# ---
136136
# name: test_sensors[sensor.energy_site_battery_discharged-statealt]
@@ -205,7 +205,7 @@
205205
'last_changed': <ANY>,
206206
'last_reported': <ANY>,
207207
'last_updated': <ANY>,
208-
'state': '30.06',
208+
'state': 'unknown',
209209
})
210210
# ---
211211
# name: test_sensors[sensor.energy_site_battery_exported-statealt]
@@ -280,7 +280,7 @@
280280
'last_changed': <ANY>,
281281
'last_reported': <ANY>,
282282
'last_updated': <ANY>,
283-
'state': '0.0',
283+
'state': 'unknown',
284284
})
285285
# ---
286286
# name: test_sensors[sensor.energy_site_battery_imported_from_generator-statealt]
@@ -355,7 +355,7 @@
355355
'last_changed': <ANY>,
356356
'last_reported': <ANY>,
357357
'last_updated': <ANY>,
358-
'state': '0.08',
358+
'state': 'unknown',
359359
})
360360
# ---
361361
# name: test_sensors[sensor.energy_site_battery_imported_from_grid-statealt]
@@ -430,7 +430,7 @@
430430
'last_changed': <ANY>,
431431
'last_reported': <ANY>,
432432
'last_updated': <ANY>,
433-
'state': '43.6',
433+
'state': 'unknown',
434434
})
435435
# ---
436436
# name: test_sensors[sensor.energy_site_battery_imported_from_solar-statealt]
@@ -580,7 +580,7 @@
580580
'last_changed': <ANY>,
581581
'last_reported': <ANY>,
582582
'last_updated': <ANY>,
583-
'state': '30.022',
583+
'state': 'unknown',
584584
})
585585
# ---
586586
# name: test_sensors[sensor.energy_site_consumer_imported_from_battery-statealt]
@@ -655,7 +655,7 @@
655655
'last_changed': <ANY>,
656656
'last_reported': <ANY>,
657657
'last_updated': <ANY>,
658-
'state': '0.0',
658+
'state': 'unknown',
659659
})
660660
# ---
661661
# name: test_sensors[sensor.energy_site_consumer_imported_from_generator-statealt]
@@ -730,7 +730,7 @@
730730
'last_changed': <ANY>,
731731
'last_reported': <ANY>,
732732
'last_updated': <ANY>,
733-
'state': '1.282',
733+
'state': 'unknown',
734734
})
735735
# ---
736736
# name: test_sensors[sensor.energy_site_consumer_imported_from_grid-statealt]
@@ -805,7 +805,7 @@
805805
'last_changed': <ANY>,
806806
'last_reported': <ANY>,
807807
'last_updated': <ANY>,
808-
'state': '30.96',
808+
'state': 'unknown',
809809
})
810810
# ---
811811
# name: test_sensors[sensor.energy_site_consumer_imported_from_solar-statealt]
@@ -955,7 +955,7 @@
955955
'last_changed': <ANY>,
956956
'last_reported': <ANY>,
957957
'last_updated': <ANY>,
958-
'state': '0.001',
958+
'state': 'unknown',
959959
})
960960
# ---
961961
# name: test_sensors[sensor.energy_site_generator_exported-statealt]
@@ -1105,7 +1105,7 @@
11051105
'last_changed': <ANY>,
11061106
'last_reported': <ANY>,
11071107
'last_updated': <ANY>,
1108-
'state': '0.0',
1108+
'state': 'unknown',
11091109
})
11101110
# ---
11111111
# name: test_sensors[sensor.energy_site_grid_exported-statealt]
@@ -1180,7 +1180,7 @@
11801180
'last_changed': <ANY>,
11811181
'last_reported': <ANY>,
11821182
'last_updated': <ANY>,
1183-
'state': '0.048',
1183+
'state': 'unknown',
11841184
})
11851185
# ---
11861186
# name: test_sensors[sensor.energy_site_grid_exported_from_battery-statealt]
@@ -1255,7 +1255,7 @@
12551255
'last_changed': <ANY>,
12561256
'last_reported': <ANY>,
12571257
'last_updated': <ANY>,
1258-
'state': '0.0',
1258+
'state': 'unknown',
12591259
})
12601260
# ---
12611261
# name: test_sensors[sensor.energy_site_grid_exported_from_generator-statealt]
@@ -1330,7 +1330,7 @@
13301330
'last_changed': <ANY>,
13311331
'last_reported': <ANY>,
13321332
'last_updated': <ANY>,
1333-
'state': '127.32',
1333+
'state': 'unknown',
13341334
})
13351335
# ---
13361336
# name: test_sensors[sensor.energy_site_grid_exported_from_solar-statealt]
@@ -1405,7 +1405,7 @@
14051405
'last_changed': <ANY>,
14061406
'last_reported': <ANY>,
14071407
'last_updated': <ANY>,
1408-
'state': '1.542',
1408+
'state': 'unknown',
14091409
})
14101410
# ---
14111411
# name: test_sensors[sensor.energy_site_grid_imported-statealt]
@@ -1555,7 +1555,7 @@
15551555
'last_changed': <ANY>,
15561556
'last_reported': <ANY>,
15571557
'last_updated': <ANY>,
1558-
'state': '0.0106171875',
1558+
'state': 'unknown',
15591559
})
15601560
# ---
15611561
# name: test_sensors[sensor.energy_site_grid_services_exported-statealt]
@@ -1630,7 +1630,7 @@
16301630
'last_changed': <ANY>,
16311631
'last_reported': <ANY>,
16321632
'last_updated': <ANY>,
1633-
'state': '0.0450625',
1633+
'state': 'unknown',
16341634
})
16351635
# ---
16361636
# name: test_sensors[sensor.energy_site_grid_services_imported-statealt]
@@ -1865,7 +1865,7 @@
18651865
'last_changed': <ANY>,
18661866
'last_reported': <ANY>,
18671867
'last_updated': <ANY>,
1868-
'state': '0.0',
1868+
'state': 'unknown',
18691869
})
18701870
# ---
18711871
# name: test_sensors[sensor.energy_site_home_usage-statealt]
@@ -2087,7 +2087,7 @@
20872087
'last_changed': <ANY>,
20882088
'last_reported': <ANY>,
20892089
'last_updated': <ANY>,
2090-
'state': '211.88',
2090+
'state': 'unknown',
20912091
})
20922092
# ---
20932093
# name: test_sensors[sensor.energy_site_solar_exported-statealt]
@@ -2162,7 +2162,7 @@
21622162
'last_changed': <ANY>,
21632163
'last_reported': <ANY>,
21642164
'last_updated': <ANY>,
2165-
'state': '0.0',
2165+
'state': 'unknown',
21662166
})
21672167
# ---
21682168
# name: test_sensors[sensor.energy_site_solar_generated-statealt]

‎tests/components/tesla_fleet/test_init.py‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -317,18 +317,26 @@ async def test_energy_site_refresh_error(
317317

318318

319319
# Test Energy History Coordinator
320-
@pytest.mark.parametrize(("side_effect", "state"), ERRORS)
320+
@pytest.mark.parametrize(("side_effect"), [side_effect for side_effect, _ in ERRORS])
321321
async def test_energy_history_refresh_error(
322322
hass: HomeAssistant,
323323
normal_config_entry: MockConfigEntry,
324324
mock_energy_history: AsyncMock,
325325
side_effect: TeslaFleetError,
326-
state: ConfigEntryState,
326+
freezer: FrozenDateTimeFactory,
327327
) -> None:
328328
"""Test coordinator refresh with an error."""
329-
mock_energy_history.side_effect = side_effect
330329
await setup_platform(hass, normal_config_entry)
331-
assert normal_config_entry.state is state
330+
assert normal_config_entry.state is ConfigEntryState.LOADED
331+
332+
# Now test that the coordinator handles errors during refresh
333+
mock_energy_history.side_effect = side_effect
334+
freezer.tick(ENERGY_HISTORY_INTERVAL)
335+
async_fire_time_changed(hass)
336+
await hass.async_block_till_done()
337+
338+
# The coordinator should handle the error gracefully
339+
assert normal_config_entry.state is ConfigEntryState.LOADED
332340

333341

334342
async def test_energy_live_refresh_ratelimited(
@@ -410,20 +418,20 @@ async def test_energy_history_refresh_ratelimited(
410418
async_fire_time_changed(hass)
411419
await hass.async_block_till_done()
412420

413-
assert mock_energy_history.call_count == 2
421+
assert mock_energy_history.call_count == 1
414422

415423
freezer.tick(ENERGY_HISTORY_INTERVAL)
416424
async_fire_time_changed(hass)
417425
await hass.async_block_till_done()
418426

419427
# Should not call for another 10 seconds
420-
assert mock_energy_history.call_count == 2
428+
assert mock_energy_history.call_count == 1
421429

422430
freezer.tick(ENERGY_HISTORY_INTERVAL)
423431
async_fire_time_changed(hass)
424432
await hass.async_block_till_done()
425433

426-
assert mock_energy_history.call_count == 3
434+
assert mock_energy_history.call_count == 2
427435

428436

429437
async def test_init_region_issue(

0 commit comments

Comments
 (0)