Browse Source

ref: remove usage of CanonicalKeyDict in tests (#71093)

it has no effect in production so I'm removing it

<!-- Describe your PR here. -->
anthony sottile 9 months ago
parent
commit
3ecef851b6

+ 2 - 2
tests/sentry/issues/test_ingest.py

@@ -119,7 +119,7 @@ class SaveIssueOccurrenceTest(OccurrenceTestMixin, TestCase):
 
     def test_different_ids(self) -> None:
         create_default_projects()
-        event_data = load_data("generic-event-profiling").data
+        event_data = load_data("generic-event-profiling")
         project_id = event_data["event"].pop("project_id", self.project.id)
         event_data["event"]["timestamp"] = timezone.now().isoformat()
         event = self.store_event(data=event_data["event"], project_id=project_id)
@@ -444,7 +444,7 @@ class MaterializeMetadataTest(OccurrenceTestMixin, TestCase):
 class SaveIssueOccurrenceToEventstreamTest(OccurrenceTestMixin, TestCase):
     def test(self) -> None:
         create_default_projects()
-        event_data = load_data("generic-event-profiling").data
+        event_data = load_data("generic-event-profiling")
         project_id = event_data["event"].pop("project_id")
         event_data["event"]["timestamp"] = timezone.now().isoformat()
         event = self.store_event(data=event_data["event"], project_id=project_id)

+ 4 - 5
tests/sentry/models/test_processingissue.py

@@ -9,7 +9,6 @@ from sentry.models.processingissue import (
 )
 from sentry.models.rawevent import RawEvent
 from sentry.testutils.cases import TestCase
-from sentry.utils.canonical import CanonicalKeyDict
 
 
 class ProcessingIssueTest(TestCase):
@@ -76,7 +75,7 @@ class ProcessingIssueTest(TestCase):
         raw_event = RawEvent.objects.create(
             project_id=project.id,
             event_id="abc",
-            data=CanonicalKeyDict({"release": release.version, "dist": dist.name}),
+            data={"release": release.version, "dist": dist.name},
         )
 
         manager = ProcessingIssueManager()
@@ -112,7 +111,7 @@ class ProcessingIssueTest(TestCase):
         raw_event = RawEvent.objects.create(
             project_id=project.id,
             event_id="abc",
-            data=CanonicalKeyDict({"release": release.version, "dist": dist.name}),
+            data={"release": release.version, "dist": dist.name},
         )
 
         ProcessingIssue.objects.create(
@@ -167,7 +166,7 @@ class ProcessingIssueTest(TestCase):
             raw_event = RawEvent.objects.create(
                 project_id=project.id,
                 event_id=event_id,
-                data=CanonicalKeyDict({"release": release, "dist": dist}),
+                data={"release": release, "dist": dist},
             )
 
             manager = ProcessingIssueManager()
@@ -205,7 +204,7 @@ class ProcessingIssueTest(TestCase):
         raw_event = RawEvent.objects.create(
             project_id=project.id,
             event_id="abc",
-            data=CanonicalKeyDict({"release": release.version, "dist": dist_2.name}),
+            data={"release": release.version, "dist": dist_2.name},
         )
 
         ProcessingIssue.objects.create(

+ 0 - 6
tests/sentry/utils/test_safe.py

@@ -9,7 +9,6 @@ from unittest.mock import Mock, patch
 import pytest
 
 from sentry.testutils.cases import TestCase
-from sentry.utils.canonical import CanonicalKeyDict
 from sentry.utils.safe import (
     get_path,
     safe_execute,
@@ -123,7 +122,6 @@ class GetPathTest(unittest.TestCase):
         assert get_path({"a": 2}, "b") is None
         assert get_path({"a": {"b": []}}, "a", "b") == []
         assert get_path({"a": []}, "a", "b") is None
-        assert get_path(CanonicalKeyDict({"a": 2}), "a") == 2
 
     def test_get_default(self):
         assert get_path({"a": 2}, "b", default=1) == 1
@@ -185,10 +183,6 @@ class SetPathTest(unittest.TestCase):
         assert set_path(data, "a", "b", value=42)
         assert data == {"a": {"b": 42}}
 
-        data = CanonicalKeyDict({})
-        assert set_path(data, "a", value=42)
-        assert data == {"a": 42}
-
     def test_set_default(self):
         data = {"a": {"b": 2}}
         assert not setdefault_path(data, "a", "b", value=42)

+ 1 - 1
tests/snuba/api/endpoints/test_organization_events.py

@@ -5987,7 +5987,7 @@ class OrganizationEventsIssuePlatformDatasetEndpointTest(
             "user.display": user_data["email"],
             "device": "Mac",
             "os": "",
-            "url": event.interfaces.data["request"].full_url,
+            "url": event.interfaces["request"].full_url,
             "runtime": dict(event.get_raw_data()["tags"])["runtime"],
             "replayId": replay_id.replace("-", ""),
             "profile.id": profile_id.replace("-", ""),

+ 2 - 2
tests/snuba/api/endpoints/test_organization_events_facets_performance.py

@@ -66,8 +66,8 @@ class OrganizationEventsFacetsPerformanceEndpointTest(
             tags = []
         if project_id is None:
             project_id = self.project.id
-        event = load_data("transaction").copy()
-        event.data["tags"].extend(tags)
+        event = load_data("transaction")
+        event["tags"].extend(tags)
         event.update(
             {
                 "transaction": name,

+ 2 - 2
tests/snuba/api/endpoints/test_organization_events_facets_performance_histogram.py

@@ -61,8 +61,8 @@ class OrganizationEventsFacetsPerformanceHistogramEndpointTest(
             tags = []
         if project_id is None:
             project_id = self.project.id
-        event = load_data("transaction").copy()
-        event.data["tags"].extend(tags)
+        event = load_data("transaction")
+        event["tags"].extend(tags)
         event.update(
             {
                 "transaction": name,