jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 21:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure MySQL tests cleanup connections and raise an exception if they do not (#87767)

Browse Source 
Co-authored-by: epenet <6771947+epenet@users.noreply.github.com>
Co-authored-by: Erik <erik@montnemery.com>
This commit is contained in:
J. Nick Koston 2023-02-09 16:27:53 -06:00 committed by GitHub
parent 84d14cc76a
commit cbaf4764e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/components/recorder/test_init.py
View File

@ -130,6 +130,10 @@ async def test_shutdown_before_startup_finishes(
assert run_info.run_id == 1 assert run_info.run_id == 1
assert run_info.start is not None assert run_info.start is not None
assert run_info.end is not None assert run_info.end is not None
# We patched out engine to prevent the close from happening
# so we need to manually close the session
session.close()
await hass.async_add_executor_job(instance._shutdown)
async def test_canceled_before_startup_finishes( async def test_canceled_before_startup_finishes(
@ -152,6 +156,9 @@ async def test_canceled_before_startup_finishes(
"Recorder startup was externally canceled before it could complete" "Recorder startup was externally canceled before it could complete"
in caplog.text in caplog.text
) )
# We patched out engine to prevent the close from happening
# so we need to manually close the session
await hass.async_add_executor_job(instance._shutdown)
async def test_shutdown_closes_connections(recorder_mock, hass): async def test_shutdown_closes_connections(recorder_mock, hass):

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

@ -440,6 +440,7 @@ def test_forgiving_add_column(recorder_db_url: str) -> None:
migration._add_columns( migration._add_columns(
instance.get_session, "hello", ["context_id CHARACTER(36)"] instance.get_session, "hello", ["context_id CHARACTER(36)"]
) )
engine.dispose()
def test_forgiving_add_index(recorder_db_url: str) -> None: def test_forgiving_add_index(recorder_db_url: str) -> None:
@ -450,6 +451,7 @@ def test_forgiving_add_index(recorder_db_url: str) -> None:
instance = Mock() instance = Mock()
instance.get_session = Mock(return_value=session) instance.get_session = Mock(return_value=session)
migration._create_index(instance.get_session, "states", "ix_states_context_id") migration._create_index(instance.get_session, "states", "ix_states_context_id")
engine.dispose()
@pytest.mark.parametrize( @pytest.mark.parametrize(

10
tests/conftest.py
View File

@ -1077,17 +1077,17 @@ def recorder_db_url(
made_url = sa.make_url(db_url) made_url = sa.make_url(db_url)
db = made_url.database db = made_url.database
engine = sa.create_engine(db_url) engine = sa.create_engine(db_url)
# Kill any open connections to the database before dropping it # Check for any open connections to the database before dropping it
# to ensure that InnoDB does not deadlock. # to ensure that InnoDB does not deadlock.
with engine.begin() as connection: with engine.begin() as connection:
query = sa.text( query = sa.text(
"select id FROM information_schema.processlist WHERE db=:db and id != CONNECTION_ID()" "select id FROM information_schema.processlist WHERE db=:db and id != CONNECTION_ID()"
) )
for row in connection.execute(query, parameters={"db": db}).fetchall(): rows = connection.execute(query, parameters={"db": db}).fetchall()
_LOGGER.warning( if rows:
"Killing MySQL connection to temporary database %s", row.id raise RuntimeError(
f"Unable to drop database {db} because it is in use by {rows}"
) )
connection.execute(sa.text("KILL :id"), parameters={"id": row.id})
engine.dispose() engine.dispose()
sqlalchemy_utils.drop_database(db_url) sqlalchemy_utils.drop_database(db_url)
elif db_url.startswith("postgresql://"): elif db_url.startswith("postgresql://"):