Commit 6839073d by Anthony Lenton

Made tests pass in 1.1 again, and added a tox file.

parent 492e9015
...@@ -3,3 +3,4 @@ ...@@ -3,3 +3,4 @@
./build ./build
./dist ./dist
./sqlite.db ./sqlite.db
./.tox/
...@@ -267,10 +267,9 @@ class RelyingPartyTests(TestCase): ...@@ -267,10 +267,9 @@ class RelyingPartyTests(TestCase):
def test_login_with_nonascii_return_to(self): def test_login_with_nonascii_return_to(self):
"""Ensure non-ascii characters can be used for the 'next' arg.""" """Ensure non-ascii characters can be used for the 'next' arg."""
for url in [u'/files/moño.jpg', u'/files/ñandú.jpg'.encode('utf-8')]:
response = self.client.post('/openid/login/', response = self.client.post('/openid/login/',
{'openid_identifier': 'http://example.com/identity', {'openid_identifier': 'http://example.com/identity',
'next': url}) 'next': u'/files/ñandú.jpg'.encode('utf-8')})
self.assertContains(response, 'OpenID transaction in progress') self.assertContains(response, 'OpenID transaction in progress')
def test_login_no_next(self): def test_login_no_next(self):
......
...@@ -39,7 +39,7 @@ ADMINS = ( ...@@ -39,7 +39,7 @@ ADMINS = (
MANAGERS = ADMINS MANAGERS = ADMINS
if django_version >= "1.1.2": if django_version >= "1.2":
csrf_middleware = 'django.middleware.csrf.CsrfViewMiddleware' csrf_middleware = 'django.middleware.csrf.CsrfViewMiddleware'
DATABASES = { DATABASES = {
'default': { 'default': {
......
[tox]
envlist =
py2.6-django1.1, py2.6-django1.2, py2.6-django1.3, py2.6-django1.4,
py2.7-django1.1, py2.7-django1.2, py2.7-django1.3, py2.7-django1.4
[testenv]
commands = make check
# Python 2.6
[testenv:py2.6-django1.1]
basepython = python2.6
deps = django >= 1.1, < 1.2
python-openid
[testenv:py2.6-django1.2]
basepython = python2.6
deps = django >= 1.2, < 1.3
python-openid
[testenv:py2.6-django1.3]
basepython = python2.6
deps = django >= 1.3, < 1.4
python-openid
[testenv:py2.6-django1.4]
basepython = python2.6
deps = django >= 1.4, < 1.5
python-openid
# Python 2.7
[testenv:py2.7-django1.1]
basepython = python2.7
deps = django >= 1.1, < 1.2
python-openid
[testenv:py2.7-django1.2]
basepython = python2.7
deps = django >= 1.2, < 1.3
python-openid
[testenv:py2.7-django1.3]
basepython = python2.7
deps = django >= 1.3, < 1.4
python-openid
[testenv:py2.7-django1.4]
basepython = python2.7
deps = django >= 1.4, < 1.5
python-openid
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment