From c6a40d741c41cdc0af38eef89247c2120dcb6270 Mon Sep 17 00:00:00 2001 From: Dennis Fink Date: Tue, 27 Oct 2026 23:49:24 +0100 Subject: fix(core): resolve static type checking issues --- tests/cli/test_database.py | 11 +++++++++-- tests/cli/test_users.py | 3 ++- tests/test_views.py | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/cli/test_database.py b/tests/cli/test_database.py index 385e1e6..51b79ac 100644 --- a/tests/cli/test_database.py +++ b/tests/cli/test_database.py @@ -35,9 +35,16 @@ def database_app(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Iterator[Fl DATABASE.engine.dispose() +def _script_directory() -> ScriptDirectory: + """Open the migration scripts configured for this application.""" + return ScriptDirectory(str(MIGRATE.directory)) + + def _head_revision(app: Flask) -> str: with app.app_context(): - return ScriptDirectory.from_config(MIGRATE.get_config()).get_current_head() + revision = _script_directory().get_current_head() + assert revision is not None, "Expected a migration head" + return revision def _database_revision(app: Flask) -> str: @@ -128,7 +135,7 @@ def test_upgrade_applies_pending_migrations_and_preserves_data( ) -> None: # Start with the first migration, as if this were an older deployment. with database_app.app_context(): - base_revision = ScriptDirectory.from_config(MIGRATE.get_config()).get_base() + base_revision = _script_directory().get_base() assert base_revision is not None assert base_revision != _head_revision(database_app) migrate_upgrade(revision=base_revision) diff --git a/tests/cli/test_users.py b/tests/cli/test_users.py index 24bab0a..6538b27 100644 --- a/tests/cli/test_users.py +++ b/tests/cli/test_users.py @@ -7,6 +7,7 @@ from unittest.mock import patch import pytest import sqlalchemy as sa from flask import Flask +from sqlalchemy.exc import IntegrityError from webmentions_ssg import DATABASE from webmentions_ssg.models import User @@ -221,7 +222,7 @@ def test_users_cli_can_manage_legacy_whitespace_username(app: Flask) -> None: def test_users_cli_create_rolls_back_on_duplicate_race(app: Flask) -> None: - database_error = sa.exc.IntegrityError("INSERT", {}, Exception("duplicate")) + database_error = IntegrityError("INSERT", {}, Exception("duplicate")) with app.app_context(): with ( diff --git a/tests/test_views.py b/tests/test_views.py index 51b94b9..2048594 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -11,6 +11,7 @@ import pytest import sqlalchemy as sa from flask import Flask from flask.testing import FlaskClient +from sqlalchemy.exc import IntegrityError from webmentions_ssg import DATABASE as db from webmentions_ssg.models import ( @@ -741,7 +742,7 @@ def test_endpoint_recovers_from_concurrent_insert( rollback = Mock() commit = Mock( side_effect=[ - sa.exc.IntegrityError( + IntegrityError( "INSERT INTO received_webmention ...", {}, Exception("duplicate source/target"), -- cgit v1.3.1