Skip to content

typing: graduate tests.test_admin* chunk out of the mypy baseline (#1738) #2165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
feiiiiii5 wants to merge 1 commit into from
Closed

typing: graduate tests.test_admin* chunk out of the mypy baseline (#1738) #2165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions changelog.d/1738-admin-tests-mypy.changed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
- **Graduated the `tests.test_admin*` chunk out of the mypy baseline
(#1738).** Removed the two `[mypy-opencontractserver.tests.test_admin]`
and `[mypy-opencontractserver.tests.test_admin_auth]` `ignore_errors`
blocks and pruned the corresponding 122 lines from
`docs/typing/mypy_baseline.txt` (2942 → 2820). Fixes follow the established
patterns from earlier #1738 graduation passes:
- `test_admin.py` (6 errors): swapped the module-level `User =
get_user_model()` alias for the concrete
`from opencontractserver.users.models import User` import (mypy rejects a
`get_user_model()` variable as a type annotation); widened two helper
signatures from `obj: object` to `obj: Model` so `_meta` / `pk` resolve;
added `# type: ignore[arg-type]` on `CorpusAdmin(Corpus, None)` (the
Django admin's `ModelAdmin` second-arg `AdminSite` is genuinely optional
at runtime but typed as required) and `# type: ignore[method-assign]` on
the `Mock()` reassignment of `message_user` (intentional test isolation).
- `test_admin_auth.py` (116 errors): same `get_user_model()` → direct
import swap, plus class-level annotations for the seven `TestCase`
classes that store `User` instances on `setUpTestData(cls)` —
`TestAdminClaimsSync.user`, `TestAuth0SuperuserAllowlist.user`,
`TestAuth0AdminBackend.{staff_user, non_staff_user, inactive_staff,
superuser}`, `TestAdminLoginView.{staff_user, regular_user}`,
`TestAdminLogoutView.staff_user`, `TestGetUserByPayloadWithClaimSync.user`,
`TestAdminLoginRateLimit.staff_user`. 17 `# type: ignore[attr-defined]`
on `response.url` redirects (django-stubs' `_MonkeyPatchedWSGIResponse`
doesn't expose `.url` even though Django's test client always sets it on
302s).
No production code changed. The full project surface
(`mypy --config-file mypy.ini opencontractserver config`) stays clean under
both the pre-commit pin (`mypy==2.0.0`) and CI's pin (`mypy==2.1.0`).
122 changes: 0 additions & 122 deletions docs/typing/mypy_baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,128 +334,6 @@ opencontractserver/tests/performance_optimizations/test_base.py:166: error: "Dir
opencontractserver/tests/performance_optimizations/test_base.py:22: error: "setUp" undefined in superclass [misc]
opencontractserver/tests/performance_optimizations/test_base.py:52: error: "NoEmbeddingsMixin" has no attribute "addCleanup" [attr-defined]
opencontractserver/tests/performance_optimizations/test_pdf_hash_graphql.py:109: error: Value of type "Any | None" is not indexable [index]
opencontractserver/tests/test_admin.py:148: error: Cannot assign to a method [method-assign]
opencontractserver/tests/test_admin.py:19: error: "object" has no attribute "_meta" [attr-defined]
opencontractserver/tests/test_admin.py:20: error: "object" has no attribute "pk" [attr-defined]
opencontractserver/tests/test_admin.py:27: error: "object" has no attribute "_meta" [attr-defined]
opencontractserver/tests/test_admin.py:29: error: "object" has no attribute "pk" [attr-defined]
opencontractserver/tests/test_admin.py:94: error: Argument 2 to "CorpusAdmin" has incompatible type "None"; expected "AdminSite" [arg-type]
opencontractserver/tests/test_admin_auth.py:105: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:106: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:113: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:115: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:117: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:132: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:134: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:136: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:137: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:147: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:148: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:152: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:154: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:156: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:166: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:167: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:168: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:176: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:190: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:192: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:194: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:208: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:210: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:212: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:221: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:222: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:229: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:231: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:233: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:247: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:249: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:251: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:25: error: "type[TestAdminClaimsSync]" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:265: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:267: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:269: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:278: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:279: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:286: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:288: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:290: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:299: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:300: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:307: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:309: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:311: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:328: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:34: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:35: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:36: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:37: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:439: error: "type[TestAuth0AdminBackend]" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:445: error: "type[TestAuth0AdminBackend]" has no attribute "non_staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:451: error: "type[TestAuth0AdminBackend]" has no attribute "inactive_staff" [attr-defined]
opencontractserver/tests/test_admin_auth.py:457: error: "type[TestAuth0AdminBackend]" has no attribute "superuser" [attr-defined]
opencontractserver/tests/test_admin_auth.py:470: error: "TestAuth0AdminBackend" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:480: error: "TestAuth0AdminBackend" has no attribute "superuser" [attr-defined]
opencontractserver/tests/test_admin_auth.py:51: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:538: error: "TestAuth0AdminBackend" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:53: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:540: error: "TestAuth0AdminBackend" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:558: error: "type[TestAdminLoginView]" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:55: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:564: error: "type[TestAdminLoginView]" has no attribute "regular_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:625: error: "TestAdminLoginView" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:630: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:635: error: "TestAdminLoginView" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:650: error: "TestAdminLoginView" has no attribute "regular_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:65: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:66: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:685: error: "TestAdminLoginView" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:696: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:710: error: "TestAdminLoginView" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:711: error: "TestAdminLoginView" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:713: error: "TestAdminLoginView" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:715: error: "TestAdminLoginView" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:728: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:731: error: "TestAdminLoginView" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:732: error: "TestAdminLoginView" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:73: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:75: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:764: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:765: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:77: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:781: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:782: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:802: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:803: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:818: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:834: error: "type[TestAdminLogoutView]" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:846: error: "TestAdminLogoutView" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:855: error: "TestAdminLogoutView" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:866: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:871: error: "TestAdminLogoutView" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:876: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:885: error: "TestAdminLogoutView" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:890: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:891: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:901: error: "TestAdminLogoutView" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:907: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:909: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:911: error: "_MonkeyPatchedWSGIResponse" has no attribute "url" [attr-defined]
opencontractserver/tests/test_admin_auth.py:91: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:939: error: "type[TestGetUserByPayloadWithClaimSync]" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:93: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:948: error: "TestGetUserByPayloadWithClaimSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:949: error: "TestGetUserByPayloadWithClaimSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:950: error: "TestGetUserByPayloadWithClaimSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:951: error: "TestGetUserByPayloadWithClaimSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:95: error: "TestAdminClaimsSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:966: error: "TestGetUserByPayloadWithClaimSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:972: error: "TestGetUserByPayloadWithClaimSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:975: error: "TestGetUserByPayloadWithClaimSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:976: error: "TestGetUserByPayloadWithClaimSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:977: error: "TestGetUserByPayloadWithClaimSync" has no attribute "user" [attr-defined]
opencontractserver/tests/test_admin_auth.py:994: error: "type[TestAdminLoginRateLimit]" has no attribute "staff_user" [attr-defined]
opencontractserver/tests/test_analysis_annotation_import.py:126: error: Argument "analysis_results" to "import_annotations_from_analysis" has incompatible type "dict[str, object]"; expected "OpenContractsGeneratedCorpusPythonType" [arg-type]
opencontractserver/tests/test_analysis_annotation_import.py:170: error: Argument 1 to "set_permissions_for_obj_to_user" has incompatible type "User"; expected "int | str | type[User?]" [arg-type]
opencontractserver/tests/test_analysis_annotation_import.py:171: error: Argument 1 to "set_permissions_for_obj_to_user" has incompatible type "User"; expected "int | str | type[User?]" [arg-type]
Expand Down
6 changes: 0 additions & 6 deletions mypy.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,6 @@ ignore_errors = True
[mypy-opencontractserver.tests.test_url_annotation]
ignore_errors = True

[mypy-opencontractserver.tests.test_admin]
ignore_errors = True

[mypy-opencontractserver.tests.test_admin_auth]
ignore_errors = True

[mypy-opencontractserver.tests.test_analysis_annotation_import]
ignore_errors = True

Expand Down
13 changes: 6 additions & 7 deletions opencontractserver/tests/test_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
import logging
from unittest.mock import Mock, patch

from django.contrib.auth import get_user_model
from django.contrib.auth.models import Group
from django.db.models import Model
from django.test import Client, TestCase
from django.urls import reverse

from opencontractserver.corpuses.admin import CorpusAdmin
from opencontractserver.corpuses.models import Corpus

User = get_user_model()
from opencontractserver.users.models import User

logger = logging.getLogger(__name__)


def get_admin_change_view_url(obj: object) -> str:
def get_admin_change_view_url(obj: Model) -> str:
return reverse(
f"admin:{obj._meta.app_label}_{type(obj).__name__.lower()}_change",
args=(obj.pk,),
)


def get_admin_changelist_view_url(obj: object) -> str:
def get_admin_changelist_view_url(obj: Model) -> str:
return reverse(
"admin:{}_{}_changelist".format(
obj._meta.app_label, type(obj).__name__.lower()
Expand Down Expand Up @@ -91,7 +90,7 @@ def setUp(self) -> None:

self.admin_client = Client()
self.admin_client.login(username="superuser", password="secret")
self.corpus_admin = CorpusAdmin(Corpus, None)
self.corpus_admin = CorpusAdmin(Corpus, None) # type: ignore[arg-type]

def test_gremlin_changelist(self):
url = reverse("admin:analyzer_gremlinengine_changelist")
Expand Down Expand Up @@ -145,7 +144,7 @@ def test_make_public(self, mock_task):
corpus2.save()

request = Mock()
self.corpus_admin.message_user = Mock()
self.corpus_admin.message_user = Mock() # type: ignore[method-assign]

# Only pass the corpuses we created in this test
test_corpuses = Corpus.objects.filter(id__in=[corpus1.pk, corpus2.pk])
Expand Down
Loading