Skip to content

Commit 69fab17

Browse files
committed
Remove usage of DEF_BRANCH in the feeds module
1 parent 47b6477 commit 69fab17

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

codespeed/feeds.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,14 @@ def get_context_data(self, **kwargs):
3535

3636

3737
class LatestEntries(ResultFeed):
38-
description = "Last benchmark runs"
38+
description = "Last Results"
3939

4040
def result_filter(self):
41-
return Q(revision__branch__name=settings.DEF_BRANCH)
41+
return Q()
4242

4343

4444
class LatestSignificantEntries(ResultFeed):
45-
description = "Last benchmark runs with significant changes"
45+
description = "Last results with significant changes"
4646

4747
def result_filter(self):
48-
return Q(revision__branch__name=settings.DEF_BRANCH,
49-
colorcode__in=('red', 'green'))
48+
return Q(colorcode__in=('red', 'green'))

codespeed/results.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ def save_result(data):
134134

135135
def create_report_if_enough_data(rev, exe, e):
136136
"""Triggers Report creation when there are enough results"""
137+
if exe.project.track is not True:
138+
return False
139+
137140
last_revs = Revision.objects.filter(
138141
branch=rev.branch
139142
).order_by('-date')[:2]

codespeed/tests/test_views.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,3 +403,13 @@ def test_reports_post_returns_405(self):
403403
response = self.client.post(reverse('codespeed.views.reports'), {})
404404

405405
self.assertEqual(response.status_code, 405)
406+
407+
408+
class TestFeeds(TestCase):
409+
410+
def test_latest_result_feed(self):
411+
response = self.client.get(reverse('latest-results'))
412+
413+
self.assertEqual(response.status_code, 200)
414+
content = response.content.decode()
415+
self.assertIn('<atom:link ', content)

codespeed/urls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
url(r'^$', TemplateView.as_view(template_name='home.html'), name='home'),
1010
url(r'^about/$', TemplateView.as_view(template_name='about.html'), name='about'),
1111
# RSS for reports
12-
url(r'^feeds/latest/$', LatestEntries(), name='latest_feeds'),
12+
url(r'^feeds/latest/$', LatestEntries(), name='latest-results'),
1313
url(r'^feeds/latest_significant/$', LatestSignificantEntries(),
14-
name='latest_significant_feeds'),
14+
name='latest-significant-results'),
1515
)
1616

1717
urlpatterns += patterns('codespeed.views',

0 commit comments

Comments
 (0)