jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-24 13:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Raise on database error in recorder.migration._modify_columns (#123642)

Browse Source 
* Raise on database error in recorder.migration._modify_columns

* Improve test coverage
This commit is contained in:
Erik Montnemery 2024-08-15 14:46:23 +02:00 committed by GitHub
parent ab163c356f
commit f72d9a2c02
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
homeassistant/components/recorder/migration.py
View File

@ -580,6 +580,7 @@ def _modify_columns(
_LOGGER.exception( _LOGGER.exception(
"Could not modify column %s in table %s", column_def, table_name "Could not modify column %s in table %s", column_def, table_name
) )
raise
def _update_states_table_with_foreign_key_options( def _update_states_table_with_foreign_key_options(

3
tests/components/recorder/conftest.py
View File

@ -70,6 +70,7 @@ class InstrumentedMigration:
apply_update_mock: Mock apply_update_mock: Mock
stall_on_schema_version: int | None stall_on_schema_version: int | None
apply_update_stalled: threading.Event apply_update_stalled: threading.Event
apply_update_version: int | None
@pytest.fixture(name="instrument_migration") @pytest.fixture(name="instrument_migration")
@ -147,6 +148,7 @@ def instrument_migration(
old_version: int, old_version: int,
): ):
"""Control migration progress.""" """Control migration progress."""
instrumented_migration.apply_update_version = new_version
stall_version = instrumented_migration.stall_on_schema_version stall_version = instrumented_migration.stall_on_schema_version
if stall_version is None or stall_version == new_version: if stall_version is None or stall_version == new_version:
instrumented_migration.apply_update_stalled.set() instrumented_migration.apply_update_stalled.set()
@ -182,6 +184,7 @@ def instrument_migration(
apply_update_mock=apply_update_mock, apply_update_mock=apply_update_mock,
stall_on_schema_version=None, stall_on_schema_version=None,
apply_update_stalled=threading.Event(), apply_update_stalled=threading.Event(),
apply_update_version=None,
) )
instrumented_migration.live_migration_done_stall.set() instrumented_migration.live_migration_done_stall.set()

11
tests/components/recorder/test_migrate.py
View File

@ -208,8 +208,12 @@ async def test_database_migration_failed(
"expected_pn_dismiss", "expected_pn_dismiss",
), ),
[ [
(11, "DropConstraint", False, 1, 0), # Test error handling in _update_states_table_with_foreign_key_options
(44, "DropConstraint", False, 2, 1), (11, "homeassistant.components.recorder.migration.DropConstraint", False, 1, 0),
# Test error handling in _modify_columns
(12, "sqlalchemy.engine.base.Connection.execute", False, 1, 0),
# Test error handling in _drop_foreign_key_constraints
(44, "homeassistant.components.recorder.migration.DropConstraint", False, 2, 1),
], ],
) )
@pytest.mark.skip_on_db_engine(["sqlite"]) @pytest.mark.skip_on_db_engine(["sqlite"])
@ -255,7 +259,7 @@ async def test_database_migration_failed_non_sqlite(
# Make it fail # Make it fail
with patch( with patch(
f"homeassistant.components.recorder.migration.{func_to_patch}", func_to_patch,
side_effect=OperationalError( side_effect=OperationalError(
None, None, OSError("No space left on device") None, None, OSError("No space left on device")
), ),
@ -267,6 +271,7 @@ async def test_database_migration_failed_non_sqlite(
await hass.async_add_executor_job(recorder.get_instance(hass).join) await hass.async_add_executor_job(recorder.get_instance(hass).join)
await hass.async_block_till_done() await hass.async_block_till_done()
assert instrument_migration.apply_update_version == patch_version
assert recorder.util.async_migration_in_progress(hass) is False assert recorder.util.async_migration_in_progress(hass) is False
assert len(mock_create.mock_calls) == expected_pn_create assert len(mock_create.mock_calls) == expected_pn_create
assert len(mock_dismiss.mock_calls) == expected_pn_dismiss assert len(mock_dismiss.mock_calls) == expected_pn_dismiss