ref: before_now() returns aware datetimes (#66090)

so no need for re-attaching utc

since #65800

<!-- Describe your PR here. -->

tests/acceptance/test_incidents.py

@@ -1,5 +1,3 @@
-from datetime import timezone
-
 from django.utils import timezone as django_timezone
 
 from sentry.incidents.logic import update_incident_status
@@ -10,7 +8,7 @@ from sentry.testutils.silo import no_silo_test
 
 FEATURE_NAME = ["organizations:incidents", "organizations:performance-view"]
 
-event_time = before_now(days=3).replace(tzinfo=timezone.utc)
+event_time = before_now(days=3)
 
 
 @no_silo_test

tests/acceptance/test_organization_events_v2.py

@@ -1,5 +1,5 @@
 import copy
-from datetime import timedelta, timezone
+from datetime import timedelta
 from unittest.mock import patch
 from urllib.parse import urlencode
 
@@ -181,7 +181,7 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_all_events_query(self, mock_now):
-        now = before_now().replace(tzinfo=timezone.utc)
+        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))
@@ -236,7 +236,7 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_errors_query(self, mock_now):
-        now = before_now().replace(tzinfo=timezone.utc)
+        now = before_now()
         mock_now.return_value = now
         ten_mins_ago = iso_format(now - timedelta(minutes=10))
         self.store_event(
@@ -289,7 +289,7 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_transactions_query(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         event_data = generate_transaction()
 
@@ -304,7 +304,7 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_event_detail_view_from_all_events(self, mock_now):
-        now = before_now().replace(tzinfo=timezone.utc)
+        now = before_now()
         mock_now.return_value = now
         ten_mins_ago = iso_format(now - timedelta(minutes=10))
 
@@ -340,7 +340,7 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_event_detail_view_from_errors_view(self, mock_now):
-        now = before_now().replace(tzinfo=timezone.utc)
+        now = before_now()
         mock_now.return_value = now
 
         event_data = load_data("javascript")
@@ -374,7 +374,7 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_event_detail_view_from_transactions_query(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         event_data = generate_transaction(trace="a" * 32, span="ab" * 8)
         self.store_event(data=event_data, project_id=self.project.id, assert_no_errors=True)
@@ -420,7 +420,7 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_event_detail_view_from_transactions_query_siblings(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         event_data = generate_transaction(trace="a" * 32, span="ab" * 8)
 
@@ -496,7 +496,7 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_transaction_event_detail_view_ops_filtering(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         event_data = generate_transaction(trace="a" * 32, span="ab" * 8)
         self.store_event(data=event_data, project_id=self.project.id, assert_no_errors=True)
@@ -644,7 +644,7 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
     @pytest.mark.skip(reason="causing timeouts in github actions and travis")
     @patch("django.utils.timezone.now")
     def test_drilldown_result(self, mock_now):
-        now = before_now().replace(tzinfo=timezone.utc)
+        now = before_now()
         mock_now.return_value = now
         ten_mins_ago = iso_format(now - timedelta(minutes=10))
         events = (
@@ -683,7 +683,7 @@ class OrganizationEventsV2Test(AcceptanceTestCase, SnubaTestCase):
     @pytest.mark.skip(reason="not done")
     @patch("django.utils.timezone.now")
     def test_usage(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         # TODO: load events
 

tests/acceptance/test_organization_global_selection_header.py

@@ -10,7 +10,7 @@ from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
 from sentry.testutils.helpers.datetime import before_now, iso_format
 from sentry.testutils.silo import no_silo_test
 
-event_time = before_now(days=3).replace(tzinfo=timezone.utc)
+event_time = before_now(days=3)
 
 
 @no_silo_test

tests/acceptance/test_organization_group_index.py

@@ -11,7 +11,7 @@ from sentry.testutils.cases import AcceptanceTestCase, SnubaTestCase
 from sentry.testutils.helpers.datetime import before_now, iso_format
 from sentry.testutils.silo import no_silo_test
 
-event_time = before_now(days=3).replace(tzinfo=timezone.utc)
+event_time = before_now(days=3)
 
 
 @no_silo_test

tests/acceptance/test_performance_issues.py

@@ -1,6 +1,6 @@
 import random
 import string
-from datetime import timedelta, timezone
+from datetime import timedelta
 from unittest import mock
 from unittest.mock import patch
 
@@ -67,7 +67,7 @@ class PerformanceIssuesTest(AcceptanceTestCase, SnubaTestCase, PerformanceIssueT
 
     @patch("django.utils.timezone.now")
     def test_with_one_performance_issue(self, mock_now):
-        mock_now.return_value = before_now(minutes=5).replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now(minutes=5)
         event_data = self.create_sample_event(
             "n-plus-one-in-django-new-view", mock_now.return_value.timestamp()
         )
@@ -89,7 +89,7 @@ class PerformanceIssuesTest(AcceptanceTestCase, SnubaTestCase, PerformanceIssueT
 
     @patch("django.utils.timezone.now")
     def test_multiple_events_with_one_cause_are_grouped(self, mock_now):
-        mock_now.return_value = before_now(minutes=5).replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now(minutes=5)
         event_data = self.create_sample_event(
             "n-plus-one-in-django-new-view", mock_now.return_value.timestamp()
         )
@@ -100,7 +100,7 @@ class PerformanceIssuesTest(AcceptanceTestCase, SnubaTestCase, PerformanceIssueT
 
     @patch("django.utils.timezone.now")
     def test_n_one_api_call_performance_issue(self, mock_now):
-        mock_now.return_value = before_now(minutes=5).replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now(minutes=5)
         event_data = self.create_sample_event(
             "n-plus-one-api-calls/n-plus-one-api-calls-in-issue-stream",
             mock_now.return_value.timestamp(),
@@ -124,7 +124,7 @@ class PerformanceIssuesTest(AcceptanceTestCase, SnubaTestCase, PerformanceIssueT
 
     @patch("django.utils.timezone.now")
     def test_multiple_events_with_multiple_causes_are_not_grouped(self, mock_now):
-        mock_now.return_value = before_now(minutes=5).replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now(minutes=5)
 
         # Create identical events with different parent spans
         for _ in range(3):

tests/acceptance/test_performance_landing.py

@@ -1,4 +1,3 @@
-from datetime import timezone
 from unittest.mock import patch
 
 from django.db.models import F
@@ -33,7 +32,7 @@ class PerformanceLandingTest(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_with_data(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         event = load_data("transaction", timestamp=before_now(minutes=10))
         self.store_event(data=event, project_id=self.project.id)
@@ -51,7 +50,7 @@ class PerformanceLandingTest(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_with_data_and_new_widget_designs(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         event = load_data("transaction", timestamp=before_now(minutes=10))
         self.store_event(data=event, project_id=self.project.id)

tests/acceptance/test_performance_overview.py

@@ -1,4 +1,3 @@
-from datetime import timezone
 from unittest.mock import patch
 
 from django.db.models import F
@@ -33,7 +32,7 @@ class PerformanceOverviewTest(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_onboarding(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         with self.feature(FEATURE_NAMES):
             self.browser.get(self.path)
@@ -41,7 +40,7 @@ class PerformanceOverviewTest(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_with_data(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         event = load_data("transaction", timestamp=before_now(minutes=10))
         self.store_event(data=event, project_id=self.project.id)

tests/acceptance/test_performance_summary.py

@@ -1,4 +1,3 @@
-from datetime import timezone
 from unittest.mock import patch
 from urllib.parse import urlencode
 
@@ -42,7 +41,7 @@ class PerformanceSummaryTest(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_with_data(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         # Create a transaction
         event = make_event(load_data("transaction", timestamp=before_now(minutes=3)))
@@ -66,7 +65,7 @@ class PerformanceSummaryTest(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_view_details_from_summary(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         event = make_event(
             load_data(
@@ -85,7 +84,7 @@ class PerformanceSummaryTest(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_tags_page(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         tags_path = "/organizations/{}/performance/summary/tags/?{}".format(
             self.org.slug,
@@ -104,7 +103,7 @@ class PerformanceSummaryTest(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_transaction_vitals(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         vitals_path = "/organizations/{}/performance/summary/vitals/?{}".format(
             self.org.slug,
@@ -125,7 +124,7 @@ class PerformanceSummaryTest(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_transaction_vitals_filtering(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         vitals_path = "/organizations/{}/performance/summary/vitals/?{}".format(
             self.org.slug,
@@ -185,7 +184,7 @@ class PerformanceSummaryTest(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_transaction_threshold_modal(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         # Create a transaction
         event = make_event(load_data("transaction", timestamp=before_now(minutes=3)))

tests/acceptance/test_performance_trace_detail.py

@@ -1,4 +1,4 @@
-from datetime import timedelta, timezone
+from datetime import timedelta
 from unittest.mock import patch
 from uuid import uuid4
 
@@ -189,7 +189,7 @@ class PerformanceTraceDetailTest(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_with_data(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
 
         with self.feature(FEATURE_NAMES):
             self.browser.get(self.path)

tests/acceptance/test_performance_trends.py

@@ -1,4 +1,3 @@
-from datetime import timezone
 from unittest.mock import patch
 from urllib.parse import urlencode
 
@@ -59,7 +58,7 @@ class PerformanceTrendsTest(AcceptanceTestCase, SnubaTestCase):
 
     @patch("django.utils.timezone.now")
     def test_with_data(self, mock_now):
-        mock_now.return_value = before_now().replace(tzinfo=timezone.utc)
+        mock_now.return_value = before_now()
         values = range(1, 100, 5)
 
         self.make_trend("improvement", [v for v in reversed(values)])