|
1 |
| -import logging |
2 |
| -from unittest import mock |
3 |
| - |
4 |
| -import pytest |
5 |
| - |
6 |
| -from sentry import eventstore |
7 | 1 | from sentry.eventstore.base import EventStorage
|
8 | 2 | from sentry.eventstore.models import Event
|
9 | 3 | from sentry.snuba.dataset import Dataset
|
10 |
| -from sentry.testutils.cases import SnubaTestCase, TestCase |
| 4 | +from sentry.testutils.cases import TestCase |
11 | 5 | from sentry.testutils.helpers.datetime import before_now
|
12 | 6 | from sentry.testutils.skips import requires_snuba
|
13 |
| -from sentry.utils.samples import load_data |
14 | 7 |
|
15 | 8 | pytestmark = [requires_snuba]
|
16 | 9 |
|
@@ -39,64 +32,9 @@ def test_bind_nodes(self):
|
39 | 32 |
|
40 | 33 | event = Event(project_id=self.project.id, event_id="a" * 32)
|
41 | 34 | event2 = Event(project_id=self.project.id, event_id="b" * 32)
|
42 |
| - assert event.data._node_data is None |
| 35 | + before = event.data._node_data |
43 | 36 | self.eventstorage.bind_nodes([event, event2])
|
44 |
| - assert event.data._node_data is not None |
| 37 | + after = event.data._node_data |
| 38 | + assert before is None |
| 39 | + assert after is not None |
45 | 40 | assert event.data["user"]["id"] == "user1"
|
46 |
| - |
47 |
| - |
48 |
| -class ServiceDelegationTest(TestCase, SnubaTestCase): |
49 |
| - def setUp(self): |
50 |
| - super().setUp() |
51 |
| - self.min_ago = before_now(minutes=1) |
52 |
| - self.two_min_ago = before_now(minutes=2) |
53 |
| - self.project = self.create_project() |
54 |
| - |
55 |
| - self.event = self.store_event( |
56 |
| - data={ |
57 |
| - "event_id": "a" * 32, |
58 |
| - "type": "default", |
59 |
| - "platform": "python", |
60 |
| - "fingerprint": ["group1"], |
61 |
| - "timestamp": self.two_min_ago, |
62 |
| - "tags": {"foo": "1"}, |
63 |
| - }, |
64 |
| - project_id=self.project.id, |
65 |
| - ) |
66 |
| - |
67 |
| - event_data = load_data("transaction") |
68 |
| - event_data["timestamp"] = before_now(minutes=1) |
69 |
| - event_data["start_timestamp"] = before_now(minutes=1, seconds=1) |
70 |
| - event_data["event_id"] = "b" * 32 |
71 |
| - |
72 |
| - self.transaction_event = self.store_event(data=event_data, project_id=self.project.id) |
73 |
| - |
74 |
| - @pytest.mark.skip(reason="There is no longer a difference in underlying dataset.") |
75 |
| - def test_logs_differences(self): |
76 |
| - logger = logging.getLogger("sentry.eventstore") |
77 |
| - |
78 |
| - with mock.patch.object(logger, "info") as mock_logger: |
79 |
| - # No differences to log |
80 |
| - _filter = eventstore.Filter(project_ids=[self.project.id]) |
81 |
| - eventstore.backend.get_events(filter=_filter) |
82 |
| - eventstore.backend.get_event_by_id(self.project.id, "a" * 32) |
83 |
| - assert mock_logger.call_count == 0 |
84 |
| - |
85 |
| - # Here we expect a difference since the original implementation handles type as a tag |
86 |
| - event = eventstore.backend.get_event_by_id(self.project.id, "a" * 32) |
87 |
| - _filter = eventstore.Filter( |
88 |
| - project_ids=[self.project.id], conditions=[["type", "=", "transaction"]] |
89 |
| - ) |
90 |
| - eventstore.get_next_event_id(event, _filter) |
91 |
| - assert mock_logger.call_count == 1 |
92 |
| - mock_logger.assert_called_with( |
93 |
| - "discover.result-mismatch", |
94 |
| - extra={ |
95 |
| - "snuba_result": None, |
96 |
| - "snuba_discover_result": (str(self.project.id), "b" * 32), |
97 |
| - "method": "get_next_event_id", |
98 |
| - "event_id": event.event_id, |
99 |
| - "filter_keys": _filter.filter_keys, |
100 |
| - "conditions": _filter.conditions, |
101 |
| - }, |
102 |
| - ) |
0 commit comments