Extend test_services.test_query_service_rollback_on_error

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

Author: davidrapan

homeassistant/components/sql/util.py

@@ -197,7 +197,10 @@ async def _shutdown_db_engines(_: Event) -> None:
         """Shutdown all database engines."""
         for sessmaker in session_makers_by_db_url.values():
             if isinstance(sessmaker, async_scoped_session):
+                _LOGGER.error("Disposed async engine for shutdown 1")
                 await (await sessmaker.connection()).engine.dispose()
+                _LOGGER.error("Disposed async engine for shutdown 2")
+                raise Exception("Disposed async engine for shutdown")
             else:
                 sessmaker.connection().engine.dispose()
 

tests/components/sql/test_sensor.py

@@ -193,18 +193,6 @@ def make_test_db():
 @pytest.mark.parametrize(
     ("patch_create", "url", "expected_patterns", "not_expected_patterns"),
     [
-        (
-            "homeassistant.components.sql.util.sqlalchemy.create_engine",
-            "sqlite://homeassistant:[email protected]",
-            ["sqlite://****:****@homeassistant.local"],
-            ["sqlite://homeassistant:[email protected]"],
-        ),
-        (
-            "homeassistant.components.sql.util.sqlalchemy.create_engine",
-            "sqlite://homeassistant.local",
-            ["sqlite://homeassistant.local"],
-            [],
-        ),
         (
             "homeassistant.components.sql.util.create_async_engine",
             "sqlite+aiosqlite://homeassistant:[email protected]",
@@ -217,6 +205,18 @@ def make_test_db():
             ["sqlite+aiosqlite://homeassistant.local"],
             [],
         ),
+        (
+            "homeassistant.components.sql.util.sqlalchemy.create_engine",
+            "sqlite://homeassistant:[email protected]",
+            ["sqlite://****:****@homeassistant.local"],
+            ["sqlite://homeassistant:[email protected]"],
+        ),
+        (
+            "homeassistant.components.sql.util.sqlalchemy.create_engine",
+            "sqlite://homeassistant.local",
+            ["sqlite://homeassistant.local"],
+            [],
+        ),
     ],
 )
 async def test_invalid_url_setup(
@@ -301,7 +301,7 @@ def rollback(self) -> None:
     assert "sqlite://****:****@homeassistant.local" in caplog.text
 
 
-@pytest.mark.parametrize("async_driver", [False, True])
+@pytest.mark.parametrize("async_driver", [True, False])
 async def test_query_from_yaml(
     recorder_mock: Recorder, hass: HomeAssistant, async_driver: bool
 ) -> None:
@@ -411,18 +411,6 @@ async def test_config_from_old_yaml(
 @pytest.mark.parametrize(
     ("patch_create", "url", "expected_patterns", "not_expected_patterns"),
     [
-        (
-            "homeassistant.components.sql.util.sqlalchemy.create_engine",
-            "sqlite://homeassistant:[email protected]",
-            ["sqlite://****:****@homeassistant.local"],
-            ["sqlite://homeassistant:[email protected]"],
-        ),
-        (
-            "homeassistant.components.sql.util.sqlalchemy.create_engine",
-            "sqlite://homeassistant.local",
-            ["sqlite://homeassistant.local"],
-            [],
-        ),
         (
             "homeassistant.components.sql.util.create_async_engine",
             "sqlite+aiosqlite://homeassistant:[email protected]",
@@ -435,6 +423,18 @@ async def test_config_from_old_yaml(
             ["sqlite+aiosqlite://homeassistant.local"],
             [],
         ),
+        (
+            "homeassistant.components.sql.util.sqlalchemy.create_engine",
+            "sqlite://homeassistant:[email protected]",
+            ["sqlite://****:****@homeassistant.local"],
+            ["sqlite://homeassistant:[email protected]"],
+        ),
+        (
+            "homeassistant.components.sql.util.sqlalchemy.create_engine",
+            "sqlite://homeassistant.local",
+            ["sqlite://homeassistant.local"],
+            [],
+        ),
     ],
 )
 async def test_invalid_url_setup_from_yaml(
@@ -728,17 +728,17 @@ async def test_attributes_from_entry_config(
 @pytest.mark.parametrize(
     ("config", "patch_rollback"),
     [
-        (
-            {},
-            "sqlalchemy.orm.session.Session.rollback",
-        ),
         (
             {CONF_DB_URL: "sqlite+aiosqlite:///"},
             "sqlalchemy.ext.asyncio.session.AsyncSession.rollback",
         ),
+        (
+            {},
+            "sqlalchemy.orm.session.Session.rollback",
+        ),
     ],
 )
-async def test_session_rollback_on_error(
+async def test_query_rollback_on_error(
     recorder_mock: Recorder,
     hass: HomeAssistant,
     freezer: FrozenDateTimeFactory,

tests/components/sql/test_services.py

@@ -7,7 +7,7 @@
 from unittest.mock import patch
 
 import pytest
-from sqlalchemy.exc import SQLAlchemyError
+from sqlalchemy import text
 import voluptuous as vol
 from voluptuous import MultipleInvalid
 
@@ -87,14 +87,29 @@ async def test_query_service_external_db(hass: HomeAssistant, tmp_path: Path) ->
     }
 
 
+@pytest.mark.parametrize(
+    ("async_driver", "patch_rollback"),
+    [
+        (
+            True,
+            "sqlalchemy.ext.asyncio.session.AsyncSession.rollback",
+        ),
+        (
+            False,
+            "sqlalchemy.orm.session.Session.rollback",
+        ),
+    ],
+)
 async def test_query_service_rollback_on_error(
     hass: HomeAssistant,
     tmp_path: Path,
     caplog: pytest.LogCaptureFixture,
+    async_driver: bool,
+    patch_rollback: str,
 ) -> None:
     """Test the query service."""
     db_path = tmp_path / "test.db"
-    db_url = f"sqlite:///{db_path}"
+    db_url = f"sqlite{'+aiosqlite' if async_driver else ''}:///{db_path}"
 
     # Create and populate the external database
     conn = sqlite3.connect(db_path)
@@ -109,12 +124,12 @@ async def test_query_service_rollback_on_error(
     with (
         patch(
             "homeassistant.components.sql.services.generate_lambda_stmt",
-            side_effect=SQLAlchemyError("Error executing query"),
+            return_value=text("Faulty syntax create operational issue"),
         ),
         pytest.raises(
             ServiceValidationError, match="An error occurred when executing the query"
         ),
-        patch("sqlalchemy.orm.session.Session.rollback") as mock_session_rollback,
+        patch(patch_rollback) as mock_session_rollback,
     ):
         await hass.services.async_call(
             DOMAIN,
@@ -124,8 +139,11 @@ async def test_query_service_rollback_on_error(
             return_response=True,
         )
 
+    assert "sqlite3.OperationalError" in caplog.text
     assert mock_session_rollback.call_count == 1
 
+    await hass.async_stop()
+
 
 async def test_query_service_data_conversion(
     hass: HomeAssistant, tmp_path: Path