Skip to content

Commit 8059689

Browse files
committed
Fix remaining Django 1.10 deprecations.
- Don't use RequestContext - Don't use dotted url path
1 parent 7ca36b8 commit 8059689

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

codespeed/tests/test_views.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
class TestAddResult(TestCase):
1515

1616
def setUp(self):
17-
self.path = reverse('codespeed.views.add_result')
17+
self.path = reverse('add-result')
1818
self.e = Environment.objects.create(name='Dual Core',
1919
cpu='Core 2 Duo 8200')
2020
temp = datetime.today()
@@ -167,12 +167,13 @@ def test_add_result_with_no_project(self):
167167
class TestAddJSONResults(TestCase):
168168

169169
def setUp(self):
170-
self.path = reverse('codespeed.views.add_json_results')
170+
self.path = reverse('add-json-results')
171171
self.e = Environment(name='bigdog', cpu='Core 2 Duo 8200')
172172
self.e.save()
173173
temp = datetime.today()
174174
self.cdate = datetime(
175-
temp.year, temp.month, temp.day, temp.hour, temp.minute, temp.second)
175+
temp.year, temp.month, temp.day, temp.hour, temp.minute,
176+
temp.second)
176177

177178
self.data = [
178179
{'commitid': '123',
@@ -335,7 +336,7 @@ def test_fixture(self):
335336
def test_gettimelinedata(self):
336337
"""Test that gettimelinedata returns correct timeline data
337338
"""
338-
path = reverse('codespeed.views.gettimelinedata')
339+
path = reverse('gettimelinedata')
339340
data = {
340341
"exe": "1,2",
341342
"base": "2+4",
@@ -382,16 +383,16 @@ def setUp(self):
382383
'environment': 'Dual Core',
383384
'result_value': 200,
384385
}
385-
resp = self.client.post(reverse('codespeed.views.add_result'),
386+
resp = self.client.post(reverse('add-result'),
386387
self.data)
387388
self.assertEqual(resp.status_code, 202)
388389
self.data['commitid'] = "abcd2"
389390
self.data['result_value'] = 150
390-
self.client.post(reverse('codespeed.views.add_result'), self.data)
391+
self.client.post(reverse('add-result'), self.data)
391392
self.assertEqual(resp.status_code, 202)
392393

393394
def test_reports(self):
394-
response = self.client.get(reverse('codespeed.views.reports'))
395+
response = self.client.get(reverse('reports'))
395396

396397
self.assertEqual(response.status_code, 200)
397398
content = response.content.decode()
@@ -400,7 +401,7 @@ def test_reports(self):
400401
self.assertIn(self.data['commitid'], content)
401402

402403
def test_reports_post_returns_405(self):
403-
response = self.client.post(reverse('codespeed.views.reports'), {})
404+
response = self.client.post(reverse('reports'), {})
404405

405406
self.assertEqual(response.status_code, 405)
406407

codespeed/urls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929

3030
urlpatterns += [
3131
# URLs for adding results
32-
url(r'^result/add/json/$', views.add_json_results),
33-
url(r'^result/add/$', views.add_result),
32+
url(r'^result/add/json/$', views.add_json_results, name='add-json-results'),
33+
url(r'^result/add/$', views.add_result, name='add-result'),
3434
]

codespeed/views.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -702,8 +702,7 @@ def reports(request):
702702
colorcode__in=('red', 'green')
703703
).order_by('-revision__date')[:10]
704704

705-
return render_to_response('codespeed/reports.html', context,
706-
context_instance=RequestContext(request))
705+
return render_to_response('codespeed/reports.html', context)
707706

708707

709708
@require_GET

0 commit comments

Comments
 (0)