Просмотр исходного кода

ref: remove erroneously overridden do_request (#74800)

<!-- Describe your PR here. -->
anthony sottile 7 месяцев назад
Родитель
Сommit
59a0547bd7

+ 6 - 6
tests/snuba/api/endpoints/test_organization_events_stats_span_indexed.py

@@ -23,7 +23,7 @@ class OrganizationEventsStatsSpansMetricsEndpointTest(OrganizationEventsEndpoint
             kwargs={"organization_id_or_slug": self.project.organization.slug},
         )
 
-    def do_request(self, data, url=None, features=None):
+    def _do_request(self, data, url=None, features=None):
         if features is None:
             features = {"organizations:discover-basic": True}
         features.update(self.features)
@@ -47,7 +47,7 @@ class OrganizationEventsStatsSpansMetricsEndpointTest(OrganizationEventsEndpoint
                 )
 
         for axis in ["epm()", "spm()"]:
-            response = self.do_request(
+            response = self._do_request(
                 data={
                     "start": iso_format(self.day_ago),
                     "end": iso_format(self.day_ago + timedelta(hours=6)),
@@ -81,7 +81,7 @@ class OrganizationEventsStatsSpansMetricsEndpointTest(OrganizationEventsEndpoint
                 )
 
         for axis in ["epm()", "spm()"]:
-            response = self.do_request(
+            response = self._do_request(
                 data={
                     "start": iso_format(self.day_ago),
                     "end": iso_format(self.day_ago + timedelta(hours=24)),
@@ -113,7 +113,7 @@ class OrganizationEventsStatsSpansMetricsEndpointTest(OrganizationEventsEndpoint
                 )
 
         for axis in ["epm()", "spm()"]:
-            response = self.do_request(
+            response = self._do_request(
                 data={
                     "start": iso_format(self.day_ago + timedelta(minutes=30)),
                     "end": iso_format(self.day_ago + timedelta(hours=6, minutes=30)),
@@ -147,7 +147,7 @@ class OrganizationEventsStatsSpansMetricsEndpointTest(OrganizationEventsEndpoint
                 )
 
         for axis in ["eps()", "sps()"]:
-            response = self.do_request(
+            response = self._do_request(
                 data={
                     "start": iso_format(self.day_ago),
                     "end": iso_format(self.day_ago + timedelta(minutes=6)),
@@ -187,7 +187,7 @@ class OrganizationEventsStatsSpansMetricsEndpointTest(OrganizationEventsEndpoint
             ]
         )
 
-        response = self.do_request(
+        response = self._do_request(
             data={
                 "start": iso_format(self.day_ago),
                 "end": iso_format(self.day_ago + timedelta(minutes=6)),

+ 1 - 7
tests/snuba/api/endpoints/test_organization_events_stats_span_metrics.py

@@ -16,6 +16,7 @@ class OrganizationEventsStatsSpansMetricsEndpointTest(MetricsEnhancedPerformance
     METRIC_STRINGS = [
         "foo_transaction",
     ]
+    features = {"organizations:discover-basic": True}
 
     def setUp(self):
         super().setUp()
@@ -31,13 +32,6 @@ class OrganizationEventsStatsSpansMetricsEndpointTest(MetricsEnhancedPerformance
             "organizations:performance-use-metrics": True,
         }
 
-    def do_request(self, data, url=None, features=None):
-        if features is None:
-            features = {"organizations:discover-basic": True}
-        features.update(self.features)
-        with self.feature(features):
-            return self.client.get(self.url if url is None else url, data=data, format="json")
-
     # These throughput tests should roughly match the ones in OrganizationEventsStatsEndpointTest
     @pytest.mark.querybuilder
     def test_throughput_epm_hour_rollup(self):

+ 1 - 7
tests/snuba/api/endpoints/test_organization_measurements_meta.py

@@ -14,6 +14,7 @@ class OrganizationMeasurementsMetaEndpoint(MetricsEnhancedPerformanceTestCase):
     METRIC_STRINGS = [
         "d:transactions/measurements.something_custom@millisecond",
     ]
+    features = {"organizations:discover-basic": True}
 
     def setUp(self):
         super().setUp()
@@ -25,13 +26,6 @@ class OrganizationMeasurementsMetaEndpoint(MetricsEnhancedPerformanceTestCase):
         )
         self.features = {"organizations:performance-use-metrics": True}
 
-    def do_request(self, data, url=None, features=None):
-        if features is None:
-            features = {"organizations:discover-basic": True}
-        features.update(self.features)
-        with self.feature(features):
-            return self.client.get(self.url if url is None else url, data=data, format="json")
-
     def test_simple(self):
         self.store_transaction_metric(
             1,