Merge test_sensor.test_session_rollback_on_error

Signed-off-by: David Rapan <[email protected]>

Author: davidrapan

tests/components/sql/test_sensor.py

@@ -759,50 +759,28 @@ async def test_attributes_from_entry_config(
     assert CONF_STATE_CLASS not in state.attributes
 
 
-async def test_session_rollback_on_error(
-    recorder_mock: Recorder,
-    hass: HomeAssistant,
-    freezer: FrozenDateTimeFactory,
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """Test the SQL sensor."""
-    options = {
-        CONF_QUERY: "SELECT 5 as value",
-        CONF_COLUMN_NAME: "value",
-        CONF_UNIQUE_ID: "very_unique_id",
-    }
-    await init_integration(hass, title="Select value SQL query", options=options)
-    platforms = async_get_platforms(hass, "sql")
-    sql_entity = platforms[0].entities["sensor.select_value_sql_query"]
-
-    state = hass.states.get("sensor.select_value_sql_query")
-    assert state.state == "5"
-    assert state.attributes["value"] == 5
-
-    with (
-        patch.object(
-            sql_entity,
-            "_lambda_stmt",
-            generate_lambda_stmt("Faulty syntax create operational issue"),
+@pytest.mark.parametrize(
+    ("config", "patch_rollback"),
+    [
+        (
+            {},
+            "sqlalchemy.orm.session.Session.rollback",
         ),
-        patch("sqlalchemy.orm.session.Session.rollback") as mock_session_rollback,
-    ):
-        freezer.tick(timedelta(minutes=1))
-        async_fire_time_changed(hass)
-        await hass.async_block_till_done(wait_background_tasks=True)
-        assert "sqlite3.OperationalError" in caplog.text
-
-    assert mock_session_rollback.call_count == 1
-
-
-async def test_async_session_rollback_on_error(
+        (
+            {CONF_DB_URL: "sqlite+aiosqlite:///"},
+            "sqlalchemy.ext.asyncio.session.AsyncSession.rollback",
+        ),
+    ],
+)
+async def test_session_rollback_on_error(
     recorder_mock: Recorder,
     hass: HomeAssistant,
     freezer: FrozenDateTimeFactory,
     caplog: pytest.LogCaptureFixture,
+    config: dict[str, Any],
+    patch_rollback: str,
 ) -> None:
     """Test the SQL sensor."""
-    config = {CONF_DB_URL: "sqlite+aiosqlite:///"}
     options = {
         CONF_QUERY: "SELECT 5 as value",
         CONF_COLUMN_NAME: "value",
@@ -824,16 +802,14 @@ async def test_async_session_rollback_on_error(
             "_lambda_stmt",
             generate_lambda_stmt("Faulty syntax create operational issue"),
         ),
-        patch(
-            "sqlalchemy.ext.asyncio.session.AsyncSession.rollback"
-        ) as mock_async_session_rollback,
+        patch(patch_rollback) as mock_rollback,
     ):
         freezer.tick(timedelta(minutes=1))
         async_fire_time_changed(hass)
         await hass.async_block_till_done(wait_background_tasks=True)
         assert "sqlite3.OperationalError" in caplog.text
 
-    assert mock_async_session_rollback.call_count == 1
+    assert mock_rollback.call_count == 1
 
 
 async def test_query_recover_from_rollback(