From 2a1df2063df6c0021bb2667dccf9667c6363d5dd Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Mon, 9 Sep 2024 08:16:30 +0200
Subject: [PATCH] Separate recorder test fixtures disabling context id
 migration (#125324)

* Separate recorder test fixtures disabling context id migration

* Fix test
---
 .../recorder/test_migration_from_schema_32.py |  4 ++--
 ..._migration_run_time_migrations_remember.py |  6 ++++--
 .../components/recorder/test_v32_migration.py |  3 ++-
 tests/conftest.py                             | 21 ++++++++++++++-----
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/tests/components/recorder/test_migration_from_schema_32.py b/tests/components/recorder/test_migration_from_schema_32.py
index cdbbd7ec4e4..95146b970f3 100644
--- a/tests/components/recorder/test_migration_from_schema_32.py
+++ b/tests/components/recorder/test_migration_from_schema_32.py
@@ -118,7 +118,7 @@ def db_schema_32():
         yield
 
 
-@pytest.mark.parametrize("enable_migrate_context_ids", [True])
+@pytest.mark.parametrize("enable_migrate_event_context_ids", [True])
 @pytest.mark.usefixtures("db_schema_32")
 async def test_migrate_events_context_ids(
     hass: HomeAssistant, recorder_mock: Recorder
@@ -338,7 +338,7 @@ async def test_migrate_events_context_ids(
         assert get_index_by_name(session, "events", "ix_events_context_id") is None
 
 
-@pytest.mark.parametrize("enable_migrate_context_ids", [True])
+@pytest.mark.parametrize("enable_migrate_state_context_ids", [True])
 @pytest.mark.usefixtures("db_schema_32")
 async def test_migrate_states_context_ids(
     hass: HomeAssistant, recorder_mock: Recorder
diff --git a/tests/components/recorder/test_migration_run_time_migrations_remember.py b/tests/components/recorder/test_migration_run_time_migrations_remember.py
index bdd881a3a7b..880e4d6d61e 100644
--- a/tests/components/recorder/test_migration_run_time_migrations_remember.py
+++ b/tests/components/recorder/test_migration_run_time_migrations_remember.py
@@ -72,7 +72,7 @@ def _create_engine_test(*args, **kwargs):
     return engine
 
 
-@pytest.mark.parametrize("enable_migrate_context_ids", [True])
+@pytest.mark.parametrize("enable_migrate_state_context_ids", [True])
 @pytest.mark.parametrize("persistent_database", [True])
 @pytest.mark.usefixtures("hass_storage")  # Prevent test hass from writing to storage
 async def test_migration_changes_prevent_trying_to_migrate_again(
@@ -173,4 +173,6 @@ async def test_migration_changes_prevent_trying_to_migrate_again(
             await hass.async_stop()
 
     for task in tasks:
-        assert not isinstance(task, MigrationTask)
+        if not isinstance(task, MigrationTask):
+            continue
+        assert not isinstance(task.migrator, migration.StatesContextIDMigration)
diff --git a/tests/components/recorder/test_v32_migration.py b/tests/components/recorder/test_v32_migration.py
index 60f223aaa91..9a616959174 100644
--- a/tests/components/recorder/test_v32_migration.py
+++ b/tests/components/recorder/test_v32_migration.py
@@ -60,7 +60,8 @@ def _create_engine_test(schema_module: str) -> Callable:
     return _create_engine_test
 
 
-@pytest.mark.parametrize("enable_migrate_context_ids", [True])
+@pytest.mark.parametrize("enable_migrate_event_context_ids", [True])
+@pytest.mark.parametrize("enable_migrate_state_context_ids", [True])
 @pytest.mark.parametrize("enable_migrate_event_type_ids", [True])
 @pytest.mark.parametrize("enable_migrate_entity_ids", [True])
 @pytest.mark.parametrize("persistent_database", [True])
diff --git a/tests/conftest.py b/tests/conftest.py
index df183f955cb..178fdd74a69 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1293,11 +1293,21 @@ def enable_nightly_purge() -> bool:
 
 
 @pytest.fixture
-def enable_migrate_context_ids() -> bool:
+def enable_migrate_event_context_ids() -> bool:
     """Fixture to control enabling of recorder's context id migration.
 
     To enable context id migration, tests can be marked with:
-    @pytest.mark.parametrize("enable_migrate_context_ids", [True])
+    @pytest.mark.parametrize("enable_migrate_event_context_ids", [True])
+    """
+    return False
+
+
+@pytest.fixture
+def enable_migrate_state_context_ids() -> bool:
+    """Fixture to control enabling of recorder's context id migration.
+
+    To enable context id migration, tests can be marked with:
+    @pytest.mark.parametrize("enable_migrate_state_context_ids", [True])
     """
     return False
 
@@ -1465,7 +1475,8 @@ async def async_test_recorder(
     enable_statistics: bool,
     enable_missing_statistics: bool,
     enable_schema_validation: bool,
-    enable_migrate_context_ids: bool,
+    enable_migrate_event_context_ids: bool,
+    enable_migrate_state_context_ids: bool,
     enable_migrate_event_type_ids: bool,
     enable_migrate_entity_ids: bool,
     enable_migrate_event_ids: bool,
@@ -1527,12 +1538,12 @@ async def async_test_recorder(
     )
     migrate_states_context_ids = (
         migration.StatesContextIDMigration.migrate_data
-        if enable_migrate_context_ids
+        if enable_migrate_state_context_ids
         else None
     )
     migrate_events_context_ids = (
         migration.EventsContextIDMigration.migrate_data
-        if enable_migrate_context_ids
+        if enable_migrate_event_context_ids
         else None
     )
     migrate_event_type_ids = (