Browse Source

ref: remove remaining references to iso_format(...) (#82526)

<!-- Describe your PR here. -->
anthony sottile 2 months ago
parent
commit
27f8b06b0d

+ 1 - 5
src/sentry/testutils/helpers/datetime.py

@@ -5,11 +5,7 @@ from datetime import UTC, datetime, timedelta
 
 import time_machine
 
-__all__ = ["iso_format", "before_now", "timestamp_format"]
-
-
-def iso_format(date: datetime) -> str:
-    return date.isoformat()[:19]
+__all__ = ["before_now", "timestamp_format"]
 
 
 def before_now(**kwargs: float) -> datetime:

+ 2 - 2
tests/acceptance/test_issue_tag_values.py

@@ -1,6 +1,6 @@
 from fixtures.page_objects.issue_details import IssueDetailsPage
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 from sentry.utils.samples import load_data
 
@@ -24,7 +24,7 @@ class IssueTagValuesTest(AcceptanceTestCase, SnubaTestCase):
 
     def create_issue(self):
         event_data = load_data("javascript")
-        event_data["timestamp"] = iso_format(before_now(minutes=1))
+        event_data["timestamp"] = before_now(minutes=1).isoformat()
         event_data["tags"] = {"url": "http://example.org/path?key=value"}
         return self.store_event(data=event_data, project_id=self.project.id)
 

+ 2 - 2
tests/acceptance/test_organization_dashboards.py

@@ -20,7 +20,7 @@ from sentry.models.dashboard_widget import (
     DashboardWidgetTypes,
 )
 from sentry.testutils.cases import AcceptanceTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 
 FEATURE_NAMES = [
@@ -41,7 +41,7 @@ pytestmark = pytest.mark.sentry_metrics
 class OrganizationDashboardsAcceptanceTest(AcceptanceTestCase):
     def setUp(self):
         super().setUp()
-        min_ago = iso_format(before_now(minutes=1))
+        min_ago = before_now(minutes=1).isoformat()
         self.store_event(
             data={"event_id": "a" * 32, "message": "oh no", "timestamp": min_ago},
             project_id=self.project.id,

+ 7 - 7
tests/acceptance/test_organization_events_v2.py

@@ -9,7 +9,7 @@ from selenium.webdriver.common.keys import Keys
 
 from sentry.discover.models import DiscoverSavedQuery
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format, timestamp_format
+from sentry.testutils.helpers.datetime import before_now, timestamp_format
 from sentry.testutils.silo import no_silo_test
 from sentry.utils.samples import load_data
 
@@ -183,8 +183,8 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
     def test_all_events_query(self, mock_now):
         now = before_now()
         mock_now.return_value = now
-        five_mins_ago = iso_format(now - timedelta(minutes=5))
-        ten_mins_ago = iso_format(now - timedelta(minutes=10))
+        five_mins_ago = (now - timedelta(minutes=5)).isoformat()
+        ten_mins_ago = (now - timedelta(minutes=10)).isoformat()
         self.store_event(
             data={
                 "event_id": "a" * 32,
@@ -238,7 +238,7 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
     def test_errors_query(self, mock_now):
         now = before_now()
         mock_now.return_value = now
-        ten_mins_ago = iso_format(now - timedelta(minutes=10))
+        ten_mins_ago = (now - timedelta(minutes=10)).isoformat()
         self.store_event(
             data={
                 "event_id": "a" * 32,
@@ -306,7 +306,7 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
     def test_event_detail_view_from_all_events(self, mock_now):
         now = before_now()
         mock_now.return_value = now
-        ten_mins_ago = iso_format(now - timedelta(minutes=10))
+        ten_mins_ago = (now - timedelta(minutes=10)).isoformat()
 
         event_data = load_data("python")
         event_data.update(
@@ -346,7 +346,7 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
         event_data = load_data("javascript")
         event_data.update(
             {
-                "timestamp": iso_format(now - timedelta(minutes=5)),
+                "timestamp": (now - timedelta(minutes=5)).isoformat(),
                 "event_id": "d" * 32,
                 "fingerprint": ["group-1"],
             }
@@ -646,7 +646,7 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
     def test_drilldown_result(self, mock_now):
         now = before_now()
         mock_now.return_value = now
-        ten_mins_ago = iso_format(now - timedelta(minutes=10))
+        ten_mins_ago = (now - timedelta(minutes=10)).isoformat()
         events = (
             ("a" * 32, "oh no", "group-1"),
             ("b" * 32, "oh no", "group-1"),

+ 3 - 3
tests/acceptance/test_organization_global_selection_header.py

@@ -7,7 +7,7 @@ from django.utils import timezone as django_timezone
 from fixtures.page_objects.issue_details import IssueDetailsPage
 from fixtures.page_objects.issue_list import IssueListPage
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 
 event_time = before_now(days=3)
@@ -51,7 +51,7 @@ class OrganizationGlobalHeaderTest(AcceptanceTestCase, SnubaTestCase):
             data={
                 "event_id": "a" * 32,
                 "message": "oh no",
-                "timestamp": iso_format(event_time),
+                "timestamp": event_time.isoformat(),
                 "fingerprint": ["group-1"],
             },
             project_id=self.project_1.id,
@@ -60,7 +60,7 @@ class OrganizationGlobalHeaderTest(AcceptanceTestCase, SnubaTestCase):
             data={
                 "event_id": "b" * 32,
                 "message": "oh snap",
-                "timestamp": iso_format(event_time),
+                "timestamp": event_time.isoformat(),
                 "fingerprint": ["group-2"],
                 "environment": "prod",
             },

+ 3 - 3
tests/acceptance/test_organization_group_index.py

@@ -8,7 +8,7 @@ from sentry.models.assistant import AssistantActivity
 from sentry.models.group import GroupStatus
 from sentry.models.groupinbox import GroupInboxReason, add_group_to_inbox
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 
 event_time = before_now(days=3)
@@ -36,7 +36,7 @@ class OrganizationGroupIndexTest(AcceptanceTestCase, SnubaTestCase):
             data={
                 "event_id": "a" * 32,
                 "message": "oh no",
-                "timestamp": iso_format(event_time - timedelta(hours=1)),
+                "timestamp": (event_time - timedelta(hours=1)).isoformat(),
                 "fingerprint": ["group-1"],
             },
             project_id=self.project.id,
@@ -46,7 +46,7 @@ class OrganizationGroupIndexTest(AcceptanceTestCase, SnubaTestCase):
             data={
                 "event_id": "b" * 32,
                 "message": "oh snap",
-                "timestamp": iso_format(event_time),
+                "timestamp": event_time.isoformat(),
                 "fingerprint": ["group-2"],
             },
             project_id=self.project.id,

+ 3 - 3
tests/acceptance/test_performance_summary.py

@@ -4,7 +4,7 @@ from urllib.parse import urlencode
 from fixtures.page_objects.transaction_summary import TransactionSummaryPage
 from sentry.models.assistant import AssistantActivity
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 from sentry.utils.samples import load_data
 
@@ -52,7 +52,7 @@ class PerformanceSummaryTest(AcceptanceTestCase, SnubaTestCase):
                 "transaction": "/country_by_code/",
                 "message": "This is bad",
                 "event_id": "b" * 32,
-                "timestamp": iso_format(before_now(minutes=1)),
+                "timestamp": before_now(minutes=1).isoformat(),
             },
             project_id=self.project.id,
         )
@@ -195,7 +195,7 @@ class PerformanceSummaryTest(AcceptanceTestCase, SnubaTestCase):
                 "transaction": "/country_by_code/",
                 "message": "This is bad",
                 "event_id": "b" * 32,
-                "timestamp": iso_format(before_now(minutes=3)),
+                "timestamp": before_now(minutes=3).isoformat(),
             },
             project_id=self.project.id,
         )

+ 3 - 3
tests/acceptance/test_performance_trace_detail.py

@@ -3,7 +3,7 @@ from unittest.mock import patch
 from uuid import uuid4
 
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 from sentry.utils.samples import load_data
 
@@ -183,8 +183,8 @@ class PerformanceTraceDetailTest(AcceptanceTestCase, SnubaTestCase):
         return "/organizations/{}/performance/trace/{}/?pageStart={}&pageEnd={}".format(
             self.org.slug,
             self.trace_id,
-            iso_format(before_now(days=1).replace(hour=9, minute=0, second=0, microsecond=0)),
-            iso_format(before_now(days=1).replace(hour=11, minute=0, second=0, microsecond=0)),
+            before_now(days=1).replace(hour=9, minute=0, second=0, microsecond=0).isoformat(),
+            before_now(days=1).replace(hour=11, minute=0, second=0, microsecond=0).isoformat(),
         )
 
     @patch("django.utils.timezone.now")

+ 3 - 3
tests/acceptance/test_performance_trends.py

@@ -6,7 +6,7 @@ from django.db.models import F
 from fixtures.page_objects.base import BasePage
 from sentry.models.project import Project
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 from sentry.utils.samples import load_data
 
@@ -28,8 +28,8 @@ class PerformanceTrendsTest(AcceptanceTestCase, SnubaTestCase):
                 {
                     "transaction": name,
                     "event_id": f"{index:02x}".rjust(32, "0"),
-                    "start_timestamp": iso_format(before_now(minutes=minutes, seconds=duration)),
-                    "timestamp": iso_format(before_now(minutes=minutes)),
+                    "start_timestamp": before_now(minutes=minutes, seconds=duration).isoformat(),
+                    "timestamp": before_now(minutes=minutes).isoformat(),
                 }
             )
             self.store_event(data=event, project_id=self.project.id)

+ 2 - 2
tests/acceptance/test_project_tags_settings.py

@@ -2,7 +2,7 @@ from datetime import datetime, timezone
 from unittest.mock import patch
 
 from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
-from sentry.testutils.helpers.datetime import before_now, iso_format
+from sentry.testutils.helpers.datetime import before_now
 from sentry.testutils.silo import no_silo_test
 
 event_time = before_now(days=3)
@@ -29,7 +29,7 @@ class ProjectTagsSettingsTest(AcceptanceTestCase, SnubaTestCase):
                 "event_id": "a" * 32,
                 "message": "oh no",
                 "level": "error",
-                "timestamp": iso_format(event_time),
+                "timestamp": event_time.isoformat(),
             },
             project_id=self.project.id,
             assert_no_errors=False,

Some files were not shown because too many files changed in this diff