Skip to content

Commit 338616d

Browse files
lynnagaralynnagara
committed
fix tests
1 parent 8b234c2 commit 338616d

File tree

3 files changed

+49
-40
lines changed

3 files changed

+49
-40
lines changed

‎tests/sentry/api/endpoints/test_group_integration_details.py‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import six
44
import mock
5+
from datetime import timedelta
6+
from django.utils import timezone
57

68
from sentry.integrations.example.integration import ExampleIntegration
79
from sentry.integrations.exceptions import IntegrationError
@@ -11,6 +13,10 @@
1113

1214

1315
class GroupIntegrationDetailsTest(APITestCase):
16+
def setUp(self):
17+
super(GroupIntegrationDetailsTest, self).setUp()
18+
self.min_ago = timezone.now() - timedelta(minutes=1)
19+
1420
def test_simple_get_link(self):
1521
self.login_as(user=self.user)
1622
org = self.organization
@@ -367,8 +373,14 @@ def assert_default_project(path, action, expected_project_field):
367373

368374
self.login_as(user=self.user)
369375
org = self.organization
370-
group = self.create_group()
371-
self.create_event(group=group)
376+
event = self.store_event(
377+
data={
378+
'event_id': 'a' * 32,
379+
'timestamp': self.min_ago.isoformat()[:19],
380+
},
381+
project_id=self.project.id
382+
)
383+
group = event.group
372384
integration = Integration.objects.create(
373385
provider='example',
374386
name='Example',

‎tests/snuba/api/endpoints/test_organization_group_index.py‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
from mock import patch, Mock
1111

1212
from sentry.models import (
13-
Activity, ApiToken, Event, EventMapping, ExternalIssue, Group, GroupAssignee,
14-
GroupBookmark, GroupHash, GroupLink, GroupSeen, GroupShare, GroupSnooze,
15-
GroupStatus, GroupResolution, GroupSubscription, GroupTombstone, Integration,
13+
Activity, ApiToken, ExternalIssue, Group, GroupAssignee, GroupBookmark,
14+
GroupHash, GroupLink, GroupSeen, GroupShare, GroupSnooze, GroupStatus,
15+
GroupResolution, GroupSubscription, GroupTombstone, Integration,
1616
OrganizationIntegration, UserOption, Release
1717
)
1818
from sentry.testutils import APITestCase, SnubaTestCase
@@ -209,22 +209,21 @@ def test_auto_resolved(self):
209209
def test_lookup_by_event_id(self):
210210
project = self.project
211211
project.update_option('sentry:resolve_age', 1)
212-
group = self.create_group(checksum='a' * 32)
213-
self.create_group(checksum='b' * 32)
214212
event_id = 'c' * 32
215-
Event.objects.create(project_id=self.project.id, event_id=event_id)
216-
EventMapping.objects.create(
217-
event_id=event_id,
218-
project=group.project,
219-
group=group,
213+
event = self.store_event(
214+
data={
215+
'event_id': event_id,
216+
'timestamp': self.min_ago.isoformat()[:19],
217+
},
218+
project_id=self.project.id
220219
)
221220

222221
self.login_as(user=self.user)
223222

224223
response = self.get_valid_response(query='c' * 32)
225224
assert response['X-Sentry-Direct-Hit'] == '1'
226225
assert len(response.data) == 1
227-
assert response.data[0]['id'] == six.text_type(group.id)
226+
assert response.data[0]['id'] == six.text_type(event.group.id)
228227
assert response.data[0]['matchingEventId'] == event_id
229228

230229
def test_lookup_by_event_id_incorrect_project_id(self):
@@ -257,20 +256,20 @@ def test_lookup_by_event_id_incorrect_project_id(self):
257256
def test_lookup_by_event_id_with_whitespace(self):
258257
project = self.project
259258
project.update_option('sentry:resolve_age', 1)
260-
group = self.create_group(checksum='a' * 32)
261259
event_id = 'c' * 32
262-
self.create_group(checksum='b' * 32)
263-
EventMapping.objects.create(
264-
event_id=event_id,
265-
project=group.project,
266-
group=group,
260+
event = self.store_event(
261+
data={
262+
'event_id': event_id,
263+
'timestamp': self.min_ago.isoformat()[:19],
264+
},
265+
project_id=self.project.id
267266
)
268267

269268
self.login_as(user=self.user)
270269
response = self.get_valid_response(query=' {} '.format('c' * 32))
271270
assert response['X-Sentry-Direct-Hit'] == '1'
272271
assert len(response.data) == 1
273-
assert response.data[0]['id'] == six.text_type(group.id)
272+
assert response.data[0]['id'] == six.text_type(event.group.id)
274273
assert response.data[0]['matchingEventId'] == event_id
275274

276275
def test_lookup_by_unknown_event_id(self):

‎tests/snuba/api/endpoints/test_project_group_index.py‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@
1010
from mock import patch, Mock
1111

1212
from sentry.models import (
13-
Activity, ApiToken, EventMapping, Group, GroupAssignee, GroupBookmark, GroupHash,
14-
GroupLink, GroupResolution, GroupSeen, GroupShare, GroupSnooze, GroupStatus, GroupSubscription,
13+
Activity, ApiToken, Group, GroupAssignee, GroupBookmark, GroupHash, GroupLink,
14+
GroupResolution, GroupSeen, GroupShare, GroupSnooze, GroupStatus, GroupSubscription,
1515
GroupTombstone, ExternalIssue, Integration, Release, OrganizationIntegration, UserOption
1616
)
17-
from sentry.models.event import Event
1817
from sentry.testutils import APITestCase, SnubaTestCase
1918
from sentry.testutils.helpers import parse_link_header
2019
from six.moves.urllib.parse import quote
@@ -192,31 +191,31 @@ def test_auto_resolved(self):
192191
def test_lookup_by_event_id(self):
193192
project = self.project
194193
project.update_option('sentry:resolve_age', 1)
195-
group = self.create_group(checksum='a' * 32)
196-
self.create_group(checksum='b' * 32)
197194
event_id = 'c' * 32
198-
event = Event.objects.create(project_id=self.project.id, event_id=event_id)
199-
EventMapping.objects.create(
200-
event_id=event_id,
201-
project=group.project,
202-
group=group,
195+
event = self.store_event(
196+
data={
197+
'event_id': event_id,
198+
'timestamp': self.min_ago.isoformat()[:19],
199+
},
200+
project_id=self.project.id
203201
)
204-
205202
self.login_as(user=self.user)
206203

207204
response = self.client.get(u'{}?query={}'.format(self.path, 'c' * 32), format='json')
208205
assert response.status_code == 200
209206
assert len(response.data) == 1
210-
assert response.data[0]['id'] == six.text_type(group.id)
207+
assert response.data[0]['id'] == six.text_type(event.group.id)
211208
assert response.data[0]['matchingEventId'] == event.id
212209

213210
def test_lookup_by_event_with_matching_environment(self):
214211
project = self.project
215212
project.update_option('sentry:resolve_age', 1)
216213
self.create_environment(name="test", project=project)
214+
217215
event = self.store_event(
218216
data={
219217
'environment': 'test',
218+
'timestamp': self.min_ago.isoformat()[:19],
220219
},
221220
project_id=self.project.id,
222221
)
@@ -235,21 +234,20 @@ def test_lookup_by_event_with_matching_environment(self):
235234
def test_lookup_by_event_id_with_whitespace(self):
236235
project = self.project
237236
project.update_option('sentry:resolve_age', 1)
238-
group = self.create_group(checksum='a' * 32)
239-
self.create_group(checksum='b' * 32)
240-
EventMapping.objects.create(
241-
event_id='c' * 32,
242-
project=group.project,
243-
group=group,
237+
event = self.store_event(
238+
data={
239+
'event_id': 'c' * 32,
240+
'timestamp': self.min_ago.isoformat()[:19],
241+
},
242+
project_id=self.project.id
244243
)
245-
246244
self.login_as(user=self.user)
247245
response = self.client.get(
248246
u'{}?query=%20%20{}%20%20'.format(self.path, 'c' * 32), format='json'
249247
)
250248
assert response.status_code == 200
251249
assert len(response.data) == 1
252-
assert response.data[0]['id'] == six.text_type(group.id)
250+
assert response.data[0]['id'] == six.text_type(event.group.id)
253251

254252
def test_lookup_by_unknown_event_id(self):
255253
project = self.project

0 commit comments

Comments
 (0)