Skip to content

ref: fix some type issues in tests once models are checked #73206

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.

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

Merged
merged 1 commit into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions tests/sentry/api/endpoints/test_event_committers.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ def test_with_commit_context(self):
project_id=self.project.id,
event_type=EventType.ERROR,
)
assert event.group is not None

GroupOwner.objects.create(
group=event.group,
Expand Down Expand Up @@ -221,6 +222,7 @@ def test_with_commit_context_pull_request(self):
project_id=self.project.id,
event_type=EventType.ERROR,
)
assert event.group is not None

GroupOwner.objects.create(
group=event.group,
Expand Down
12 changes: 11 additions & 1 deletion tests/sentry/auth/test_helper.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
from __future__ import annotations

from typing import TypedDict
from unittest import mock

from django.contrib.auth.models import AnonymousUser
Expand Down Expand Up @@ -33,6 +36,13 @@ def _set_up_request():
return request


class _Identity(TypedDict):
id: str
email: str
name: str
data: dict[str, str]


class AuthIdentityHandlerTest(TestCase):
def setUp(self):
self.provider = "dummy"
Expand All @@ -42,7 +52,7 @@ def setUp(self):
organization_id=self.organization.id, provider=self.provider
)
self.email = "[email protected]"
self.identity = {
self.identity: _Identity = {
"id": "1234",
"email": self.email,
"name": "Morty",
Expand Down
1 change: 1 addition & 0 deletions tests/sentry/deletions/test_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class DeleteProjectTest(APITestCase, TransactionTestCase, HybridCloudTestMixin):
def test_simple(self):
project = self.create_project(name="test")
event = self.store_event(data={}, project_id=project.id)
assert event.group is not None
group = event.group
GroupAssignee.objects.create(group=group, project=project, user_id=self.user.id)
GroupMeta.objects.create(group=group, key="foo", value="bar")
Expand Down
2 changes: 2 additions & 0 deletions tests/sentry/event_manager/grouping/test_assign_to_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@ def test_existing_group_new_hash_exists(
existing_event = save_event_with_grouping_config(
event_data, project, NEWSTYLE_CONFIG, LEGACY_CONFIG, True
)
assert existing_event.group_id is not None
assert (
GroupHash.objects.filter(
project_id=project.id, group_id=existing_event.group_id
Expand All @@ -420,6 +421,7 @@ def test_existing_group_new_hash_exists(
)
else:
existing_event = save_event_with_grouping_config(event_data, project, NEWSTYLE_CONFIG)
assert existing_event.group_id is not None
assert (
GroupHash.objects.filter(
project_id=project.id, group_id=existing_event.group_id
Expand Down
4 changes: 4 additions & 0 deletions tests/sentry/event_manager/test_event_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -1146,6 +1146,7 @@ def test_release_project_slug_long(self) -> None:
def test_group_release_no_env(self) -> None:
project_id = self.project.id
event = self.make_release_event("1.0", project_id)
assert event.group_id is not None

release = Release.objects.get(version="1.0", projects=event.project_id)

Expand All @@ -1160,6 +1161,7 @@ def test_group_release_with_env(self) -> None:
manager = EventManager(make_event(release="1.0", environment="prod", event_id="a" * 32))
manager.normalize()
event = manager.save(self.project.id)
assert event.group_id is not None

release = Release.objects.get(version="1.0", projects=event.project_id)

Expand All @@ -1172,6 +1174,7 @@ def test_group_release_with_env(self) -> None:

release = Release.objects.get(version="1.0", projects=event.project_id)

assert event.group_id is not None
assert GroupRelease.objects.filter(
release_id=release.id, group_id=event.group_id, environment="staging"
).exists()
Expand Down Expand Up @@ -1361,6 +1364,7 @@ def save_event() -> Event:
return manager.save(self.project.id)

event = save_event()
assert event.group_id is not None

# Ensure the `GroupEnvironment` record was created.
instance = GroupEnvironment.objects.get(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ def test_non_existing_owner(self):
@freeze_time()
def test_last_triggered(self):
self.login_as(user=self.user)
rule = Rule.objects.filter(project=self.project).first()
rule = Rule.objects.filter(project=self.project).get()
resp = self.get_success_response(self.organization.slug, expand=["lastTriggered"])
assert resp.data[0]["lastTriggered"] is None
RuleFireHistory.objects.create(project=self.project, rule=rule, group=self.group)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ def setUp(self) -> None:
},
project_id=self.project.id,
)
assert self.event.group is not None
self.rule_fire_history = RuleFireHistory.objects.create(
project=self.project,
rule=self.rule,
Expand Down
6 changes: 6 additions & 0 deletions tests/sentry/models/test_projectownership.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ def test_handle_auto_assignment_when_only_codeowners_exists(self):
data=self.python_event_data(),
project_id=self.project.id,
)
assert self.event.group is not None

GroupOwner.objects.create(
group=self.event.group,
Expand Down Expand Up @@ -352,6 +353,7 @@ def test_handle_auto_assignment_when_only_suspect_commit_exists_multiple_emails(
data=self.python_event_data(),
project_id=self.project2.id,
)
assert self.event.group is not None

GroupOwner.objects.create(
group=self.event.group,
Expand Down Expand Up @@ -384,6 +386,7 @@ def test_handle_skip_auto_assignment(self):
data=self.python_event_data(),
project_id=self.project.id,
)
assert self.event.group is not None

GroupOwner.objects.create(
group=self.event.group,
Expand Down Expand Up @@ -427,6 +430,7 @@ def test_handle_skip_auto_assignment_same_assignee(self, mock_assign):
data=self.python_event_data(),
project_id=self.project.id,
)
assert self.event.group is not None

GroupOwner.objects.create(
group=self.event.group,
Expand Down Expand Up @@ -466,6 +470,7 @@ def test_handle_auto_assignment_when_codeowners_and_issueowners_exists(self):
data=self.python_event_data(),
project_id=self.project2.id,
)
assert self.event.group is not None

GroupOwner.objects.create(
group=self.event.group,
Expand Down Expand Up @@ -549,6 +554,7 @@ def test_handle_auto_assignment_when_suspect_committer_and_codeowners_and_issueo
data=self.python_event_data(),
project_id=self.project2.id,
)
assert self.event.group is not None

GroupOwner.objects.create(
group=self.event.group,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ def test_simple_with_alert_rule(self):
response = self.get_success_response(self.organization.slug, **data)

monitor = Monitor.objects.get(slug=response.data["slug"])
alert_rule_id = monitor.config.get("alert_rule_id")
alert_rule_id = monitor.config["alert_rule_id"]
rule = Rule.objects.get(
project_id=monitor.project_id, id=alert_rule_id, source=RuleSource.CRON_MONITOR
)
Expand Down
5 changes: 5 additions & 0 deletions tests/sentry/notifications/utils/test_participants.py
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ def test_send_to_suspect_committers(self):
data={"stacktrace": STACKTRACE},
project_id=self.project.id,
)
assert event.group is not None

GroupOwner.objects.create(
group=event.group,
Expand Down Expand Up @@ -535,6 +536,7 @@ def test_send_to_suspect_committers_no_owners(self):
},
project_id=project_suspect_committer.id,
)
assert event.group is not None

GroupOwner.objects.create(
group=event.group,
Expand Down Expand Up @@ -565,6 +567,7 @@ def test_send_to_suspect_committers_dupe(self):
data={"stacktrace": STACKTRACE},
project_id=self.project.id,
)
assert event.group is not None

GroupOwner.objects.create(
group=event.group,
Expand All @@ -588,6 +591,7 @@ def test_send_to_suspect_committers_exception(self):
data={"stacktrace": STACKTRACE},
project_id=self.project.id,
)
assert event.group is not None

GroupOwner.objects.create(
group=event.group,
Expand All @@ -614,6 +618,7 @@ def test_send_to_suspect_committers_not_project_member(self):
data={"stacktrace": STACKTRACE},
project_id=self.project.id,
)
assert event.group is not None

GroupOwner.objects.create(
group=event.group,
Expand Down
38 changes: 12 additions & 26 deletions tests/sentry/relay/config/test_metric_extraction.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

from collections.abc import Sequence
from datetime import timedelta
from unittest import mock
Expand Down Expand Up @@ -2091,29 +2093,13 @@ def test_widget_modifed_after_on_demand(default_project: Project) -> None:
def test_get_current_widget_specs(
default_project: Project, current_version: SpecVersion, expected: set[str]
) -> None:
for i, spec in enumerate(
[
{
"version": 1,
"hashes": ["abcd", "defg"],
"state": "enabled:manual",
},
{
"version": 2,
"hashes": ["1234", "5678"],
"state": "enabled:manual",
},
{
"version": 2,
"hashes": ["ab12", "cd78"],
"state": "disabled:high-cardinality",
},
{
"version": 2,
"hashes": ["1234"],
"state": "enabled:manual",
},
]
for i, (version, hashes, state) in enumerate(
(
(1, ["abcd", "defg"], "enabled:manual"),
(2, ["1234", "5678"], "enabled:manual"),
(2, ["ab12", "cd78"], "disabled:high-cardinality"),
(2, ["1234"], "enabled:manual"),
)
):
widget_query, _, _ = create_widget(
["epm()"],
Expand All @@ -2124,9 +2110,9 @@ def test_get_current_widget_specs(
)
DashboardWidgetQueryOnDemand.objects.create(
dashboard_widget_query=widget_query,
spec_version=spec["version"],
spec_hashes=spec["hashes"],
extraction_state=spec["state"],
spec_version=version,
spec_hashes=hashes,
extraction_state=state,
)
with mock.patch(
"sentry.snuba.metrics.extraction.OnDemandMetricSpecVersioning.get_query_spec_version",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ def add_groupowner_to_commit(self, commit: Commit, project, user):
},
project_id=project.id,
)
assert event.group is not None
self.fingerprint += 1
groupowner = GroupOwner.objects.create(
group=event.group,
Expand Down
4 changes: 2 additions & 2 deletions tests/sentry/tasks/test_commit_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,7 @@ def test_gh_comment_debounces(self, get_jwt, mock_comment_workflow, mock_get_com
groupowner = GroupOwner.objects.create(
group_id=self.event.group_id,
type=GroupOwnerType.SUSPECT_COMMIT.value,
user_id="1",
user_id=1,
project_id=self.event.project_id,
organization_id=self.project.organization_id,
context={"commitId": self.commit.id},
Expand Down Expand Up @@ -1200,7 +1200,7 @@ def test_gh_comment_multiple_comments(
groupowner = GroupOwner.objects.create(
group_id=self.event.group_id,
type=GroupOwnerType.SUSPECT_COMMIT.value,
user_id="1",
user_id=1,
project_id=self.event.project_id,
organization_id=self.project.organization_id,
context={"commitId": self.commit.id},
Expand Down
2 changes: 1 addition & 1 deletion tests/sentry/utils/test_committers.py
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ def test_no_author(self):
group_id=event.group.id, project_id=self.project.id, release_id=self.release.id
)
GroupOwner.objects.create(
group_id=event.group_id,
group_id=event.group.id,
project=self.project,
organization_id=self.organization.id,
type=GroupOwnerType.SUSPECT_COMMIT.value,
Expand Down
Loading