Commit 2ca243a1 by Tom Christie

Fix up tests and tox

parent f1251e8c
...@@ -865,4 +865,4 @@ class FieldCallableDefault(TestCase): ...@@ -865,4 +865,4 @@ class FieldCallableDefault(TestCase):
field = serializers.WritableField(default=self.simple_callable) field = serializers.WritableField(default=self.simple_callable)
into = {} into = {}
field.field_from_native({}, {}, 'field', into) field.field_from_native({}, {}, 'field', into)
self.assertEquals(into, {'field': 'foo bar'}) self.assertEqual(into, {'field': 'foo bar'})
...@@ -24,7 +24,7 @@ deps = https://www.djangoproject.com/download/1.6a1/tarball/ ...@@ -24,7 +24,7 @@ deps = https://www.djangoproject.com/download/1.6a1/tarball/
defusedxml==0.3 defusedxml==0.3
django-oauth-plus==2.0 django-oauth-plus==2.0
oauth2==1.5.211 oauth2==1.5.211
django-oauth2-provider==0.2.3 django-oauth2-provider==0.2.4
[testenv:py2.6-django1.6] [testenv:py2.6-django1.6]
basepython = python2.6 basepython = python2.6
...@@ -33,7 +33,7 @@ deps = https://www.djangoproject.com/download/1.6a1/tarball/ ...@@ -33,7 +33,7 @@ deps = https://www.djangoproject.com/download/1.6a1/tarball/
defusedxml==0.3 defusedxml==0.3
django-oauth-plus==2.0 django-oauth-plus==2.0
oauth2==1.5.211 oauth2==1.5.211
django-oauth2-provider==0.2.3 django-oauth2-provider==0.2.4
[testenv:py3.3-django1.5] [testenv:py3.3-django1.5]
basepython = python3.3 basepython = python3.3
......
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