diff --git a/tests/components/recorder/db_schema_16.py b/tests/components/recorder/db_schema_16.py index 23b0ec1f921..36641ada625 100644 --- a/tests/components/recorder/db_schema_16.py +++ b/tests/components/recorder/db_schema_16.py @@ -23,8 +23,7 @@ from sqlalchemy import ( distinct, ) from sqlalchemy.dialects import mysql -from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy.orm import relationship +from sqlalchemy.orm import declarative_base, relationship from sqlalchemy.orm.session import Session from homeassistant.const import ( diff --git a/tests/components/recorder/db_schema_18.py b/tests/components/recorder/db_schema_18.py index 3eeebc8e649..ba1cfa09cd4 100644 --- a/tests/components/recorder/db_schema_18.py +++ b/tests/components/recorder/db_schema_18.py @@ -23,8 +23,7 @@ from sqlalchemy import ( distinct, ) from sqlalchemy.dialects import mysql -from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy.orm import relationship +from sqlalchemy.orm import declarative_base, relationship from sqlalchemy.orm.session import Session from homeassistant.const import ( diff --git a/tests/components/recorder/test_init.py b/tests/components/recorder/test_init.py index 4e9a0261ec2..bdeecf14c57 100644 --- a/tests/components/recorder/test_init.py +++ b/tests/components/recorder/test_init.py @@ -2224,7 +2224,7 @@ async def test_connect_args_priority(hass: HomeAssistant, config_url) -> None: return "mysql" @classmethod - def dbapi(cls): + def import_dbapi(cls): ... def engine_created(*args): diff --git a/tests/components/recorder/test_pool.py b/tests/components/recorder/test_pool.py index f8442761200..3a6ff50af2b 100644 --- a/tests/components/recorder/test_pool.py +++ b/tests/components/recorder/test_pool.py @@ -26,14 +26,14 @@ def test_recorder_pool(caplog: pytest.LogCaptureFixture) -> None: def _get_connection_twice(): session = get_session() - connections.append(session.connection().connection.connection) + connections.append(session.connection().connection.driver_connection) session.close() if shutdown: engine.pool.shutdown() session = get_session() - connections.append(session.connection().connection.connection) + connections.append(session.connection().connection.driver_connection) session.close() caplog.clear()