Skip to content

Commit 454e024

Browse files
committed
Merge pull request pennersr#1216 from agriffis/django19-tests
Repair tests on python-3.4 with django-1.9.
2 parents 9d8ab54 + cc6b341 commit 454e024

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
- DJANGO="Django<1.7"
1212
- DJANGO="Django<1.8"
1313
- DJANGO="Django<1.9"
14-
- DJANGO="Django==1.9b1"
14+
- DJANGO="Django<1.10"
1515
cache:
1616
directories:
1717
- $HOME/.cache/pip
@@ -27,9 +27,9 @@ matrix:
2727
env: DJANGO="Django<1.8"
2828
# Django 1.9+ no longer supports python 3.2/3.3
2929
- python: "3.2"
30-
env: DJANGO="Django==1.9b1"
30+
env: DJANGO="Django<1.10"
3131
- python: "3.3"
32-
env: DJANGO="Django==1.9b1"
32+
env: DJANGO="Django<1.10"
3333
branches:
3434
only:
3535
- master

allauth/socialaccount/tests.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ def test_auto_signup(self):
6969
% self.provider.id)
7070
return
7171
resp = self.login(resp_mocks)
72-
self.assertEqual('http://testserver/accounts/profile/',
73-
resp['location'])
72+
self.assertRedirects(resp, 'http://testserver/accounts/profile/',
73+
fetch_redirect_response=False)
7474
self.assertFalse(resp.context['user'].has_usable_password())
7575

7676
def login(self, resp_mocks, process='login'):

tox.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{27,32,33,34,35}-django{16,17,18},
2+
envlist = py{27,32,33,34,35}-django{16,17,18,19}
33

44
[testenv]
55
deps =
@@ -8,6 +8,7 @@ deps =
88
django16: Django < 1.7
99
django17: Django < 1.8
1010
django18: Django < 1.9
11+
django19: Django < 1.10
1112
commands =
1213
coverage run manage.py test allauth
1314
coverage report

0 commit comments

Comments
 (0)