fixed django 1.5c2 tests

Author: saxix

.travis.yml

@@ -9,9 +9,9 @@ env:
   - DJANGO="Django==1.4.3" DBENGINE=sqlite
   - DJANGO="Django==1.4.3" DBENGINE=mysql
   - DJANGO="Django==1.4.3" DBENGINE=pg
-  - DJANGO=https://www.djangoproject.com/download/1.5c1/tarball/ DBENGINE=mysql
-  - DJANGO=https://www.djangoproject.com/download/1.5c1/tarball/ DBENGINE=pg
-  - DJANGO=https://www.djangoproject.com/download/1.5c1/tarball/ DBENGINE=sqlite
+  - DJANGO=https://www.djangoproject.com/download/1.5c2/tarball/ DBENGINE=mysql
+  - DJANGO=https://www.djangoproject.com/download/1.5c2/tarball/ DBENGINE=pg
+  - DJANGO=https://www.djangoproject.com/download/1.5c2/tarball/ DBENGINE=sqlite
 install:
   - sh -c "if [ '$DBENGINE' = 'pg' ]; then pip install -q psycopg2; fi"
   - sh -c "if [ '$DBENGINE' = 'mysql' ]; then pip install -q MySQL-python; fi"

concurrency/__init__.py

@@ -2,7 +2,7 @@
 import datetime
 import os
 
-VERSION = __version__ = (0, 4, 0, 'rc', 4)
+VERSION = __version__ = (0, 4, 0, 'rc', 5)
 __author__ = 'sax'
 
 

concurrency/tests/contrib_admin.py

@@ -1,10 +1,9 @@
 import re
-from django.contrib import admin
 import os
-
+import django.core.management
+from django.contrib import admin
 from django.conf import global_settings
 from django.contrib.auth.models import User
-import django.core.management
 from django.core.urlresolvers import reverse
 from django.forms.models import modelform_factory
 from django.test import TestCase
@@ -125,14 +124,13 @@ def test_conflict(self):
         url = reverse('admin:concurrency_testmodel1_change', args=[self.target1.pk])
         response = self.client.get(url)
         self.assertIn('original', response.context, response)
-        # form = response.context['adminform'].form
-        rex = re.compile(r'name="version" value="(\d*):(.[^"]*)"')
+        rex = re.compile(r'name="version" .*value="(\d*):(.[^"]*)"')
         m = rex.search(str(response), re.M + re.I)
         assert m.group(1) == str(response.context['original'].version)
+
         data = {'username': u'new_username',
                 'last_name': None,
                 'version': VersionFieldSigner().sign(m.group(1)),
-                # 'version': response.context['adminform'].form['version'].value(),
                 'char_field': None,
                 '_continue': 1,
                 'date_field': '2010-09-01'}
@@ -151,7 +149,7 @@ def test_sanity_signer(self):
         url = reverse('admin:concurrency_testmodel1_change', args=[self.target1.pk])
         response = self.client.get(url)
         self.assertIn('original', response.context, response)
-        rex = re.compile(r'name="version" value="(\d*):(.[^"]*)"')
+        rex = re.compile(r'name="version" .*value="(\d*):(.[^"]*)"')
 
         m1 = rex.search(str(response), re.M + re.I)
         assert m1.group(1) == str(response.context['original'].version)

tox.ini

@@ -1,16 +1,26 @@
 [tox]
 envlist =
-    py27_django14
+    dj14, dj15
 
 [testenv]
 changedir=tests
 commands =
     django-admin.py test --settings concurren
 
+setenv =
+    PYTHONPATH = /data/VENV/testing//data/VENV/LIB/django/$DJANGOVERSION:$PYTHONPATH:
+
 
-[testenv:py27_django14]
+[testenv:dj14]
 basepython = python2.7
 setenv =
     DJANGOVERSION = 1.4.3
 deps =
     -r{toxinidir}/requirements.pip
+
+[testenv:dj15]
+basepython = python2.7
+setenv =
+    DJANGOVERSION = 1.5c2
+deps =
+    -r{toxinidir}/requirements.pip