restores and fixes some tests skipped in django 1.10

Author: saxix

src/concurrency/middleware.py

@@ -14,6 +14,13 @@ class ConcurrencyMiddleware(object):
 
     """
 
+    def __init__(self, get_response=None):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        response = self.get_response(request)
+        return response
+
     def process_exception(self, request, exception):
         if isinstance(exception, RecordModifiedError):
             got_request_exception.send(sender=self, request=request)

src/requirements/develop.pip

@@ -1,4 +1,3 @@
-autopep8
 coverage
 django_extensions
 flake8

src/requirements/testing.pip

@@ -1,11 +1,13 @@
-django-webtest>=1.7.5
-mock>=1.0.1
 check-manifest==0.30
+django-webtest>=1.8.0
+mock>=1.0.1
 pytest-cache>=1.0
 pytest-cov>=1.6
-pytest-django>=2.8
+pytest-django>=3.0.0
 pytest-echo>=1.3
-pytest-pythonpath
-pytest>=2.8
-tox>=2.3
-WebTest>=2.0.11
+pytest-pythonpath>=0.7.1
+pytest>=3.0.3
+pdbpp
+readline
+tox>=2.4.1
+WebTest>=2.0.23

tests/demoapp/demo/base.py

@@ -31,6 +31,8 @@ def setUp(self):
                                                    last_login=timezone.now(),
                                                    email='[email protected]',
                                                    username='sax')
+        # self.user.set_password('123')
+        # self.user.save()
         admin_register_models()
 
 

tests/demoapp/demo/settings.py

@@ -10,7 +10,6 @@
 except ImportError:
     pass
 
-
 DEBUG = True
 STATIC_URL = '/static/'
 
@@ -32,35 +31,54 @@
                   'demo'
                   ]
 
-
 MIGRATION_MODULES = {
     'demo': 'demo.migrations',
     'auth': 'demo.auth_migrations',
 }
 
-MIDDLEWARE_CLASSES = [
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
-]
-
 if django.VERSION[1] >= 10:
+    MIDDLEWARE_CLASSES = []
+    MIDDLEWARE = [
+        # 'concurrency.middleware.ConcurrencyMiddleware',
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+        'django.middleware.csrf.CsrfViewMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+        'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    ]
+
     TEMPLATES = [
         {
             'BACKEND': 'django.template.backends.django.DjangoTemplates',
             'DIRS': [],
             'APP_DIRS': True,
             'OPTIONS': {
+                'context_processors': [
+                    'django.contrib.auth.context_processors.auth',
+                    'django.template.context_processors.debug',
+                    'django.template.context_processors.i18n',
+                    'django.template.context_processors.media',
+                    'django.template.context_processors.static',
+                    'django.template.context_processors.tz',
+                    'django.contrib.messages.context_processors.messages',
+                ],
                 # ... some options here ...
             },
         },
     ]
 else:
     TEMPLATE_DIRS = ['demo/templates']
+    MIDDLEWARE_CLASSES = [
+        # 'concurrency.middleware.ConcurrencyMiddleware',
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+        'django.middleware.csrf.CsrfViewMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+        'django.middleware.clickjacking.XFrameOptionsMiddleware',
+        'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+    ]
 
 LOGGING = {
     'version': 1,

tests/test_admin_actions.py

@@ -7,7 +7,6 @@
 from demo.util import unique_id
 
 
-@pytest.mark.xfail("django.VERSION[:2] == (1, 10)", strict=True)
 class TestAdminActions(AdminTestCase):
     def _create_conflict(self, pk):
         u = SimpleConcurrentModel.objects.get(pk=pk)

tests/test_admin_list_editable.py

@@ -5,6 +5,7 @@
 from django.contrib.admin.sites import site
 from django.contrib.contenttypes.models import ContentType
 from django.db import transaction
+from django.test import modify_settings
 from django.utils.encoding import force_text
 
 import pytest
@@ -18,7 +19,7 @@
 from concurrency.exceptions import RecordModifiedError
 
 
-@pytest.mark.xfail("django.VERSION[:2] == (1, 10)", strict=True)
+# @pytest.mark.xfail(django.VERSION[:2] == (1, 10), reason="Django 1.10")
 class TestListEditable(AdminTestCase):
     TARGET = ListEditableConcurrentModel
 

tests/test_conditional.py

@@ -113,12 +113,12 @@ def test_conflict_no_meta(instance_no_meta):
 @pytest.mark.django_db()
 def test_self_relations():
     a = ConditionalVersionModelSelfRelation.objects.create(name='a')
-    b = ConditionalVersionModelSelfRelation.objects.create(name='b')
+    ConditionalVersionModelSelfRelation.objects.create(name='b')
 
     r = ThroughRelation.objects.create(left=a,
                                        right=a)
     r.save()
 
     a1 = ConditionalVersionModelSelfRelation.objects.get(pk=a.pk)
-    a1.name='a'
+    a1.name = 'a'
     a1.save()

tests/test_middleware.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
+import django
 from django.conf import settings
 from django.contrib.admin.sites import site
 from django.core.urlresolvers import reverse
 from django.http import HttpRequest
-from django.test.utils import override_settings
+from django.test.utils import override_settings, modify_settings
 
 import mock
 import pytest
@@ -37,7 +38,7 @@ def test_middleware():
     assert r.status_code == 409
 
 
-class ConcurrencyMiddlewareTest(AdminTestCase):
+class ConcurrencyMiddlewareTest1(AdminTestCase):
     def _get_request(self, path):
         request = HttpRequest()
         request.META = {
@@ -60,37 +61,43 @@ def test_process_exception(self):
         r = ConcurrencyMiddleware().process_exception(request, RecordModifiedError(target=m))
         self.assertEqual(r.status_code, 409)
 
-    @pytest.mark.xfail("django.VERSION[:2] == (1, 10)", strict=True)
+
+class ConcurrencyMiddlewareTest2(AdminTestCase):
+
+    @property
+    def settings_middleware(self):
+        return getattr(settings, self.middleware_setting_name) + ['concurrency.middleware.ConcurrencyMiddleware']
+
+    @settings_middleware.setter
+    def settings_middleware(self, value):
+        setattr(settings, self.middleware_setting_name, value)
+
     def test_in_admin(self):
         id = next(unique_id)
-
-        middlewares = list(settings.MIDDLEWARE_CLASSES) + ['concurrency.middleware.ConcurrencyMiddleware']
         model_admin = site._registry[SimpleConcurrentModel]
 
         with attributes((model_admin.__class__, 'list_editable_policy', CONCURRENCY_LIST_EDITABLE_POLICY_ABORT_ALL),
                         (ConcurrentModelAdmin, 'form', DELETE_ATTRIBUTE)):
 
-            with self.settings(MIDDLEWARE_CLASSES=middlewares):
-
-                saved, __ = SimpleConcurrentModel.objects.get_or_create(pk=id)
+            saved, __ = SimpleConcurrentModel.objects.get_or_create(pk=id)
 
-                url = reverse('admin:demo_simpleconcurrentmodel_change', args=[saved.pk])
-                res = self.app.get(url, user='sax')
-                form = res.form
+            url = reverse('admin:demo_simpleconcurrentmodel_change', args=[saved.pk])
+            res = self.app.get(url, user=self.user.username)
+            form = res.form
 
-                saved.save()  # create conflict here
+            saved.save()  # create conflict here
 
-                res = form.submit(expect_errors=True)
+            res = form.submit(expect_errors=True)
 
-                self.assertEqual(res.status_code, 409)
+            self.assertEqual(res.status_code, 409)
 
-                target = res.context['target']
-                self.assertIn('target', res.context)
-                self.assertIn('saved', res.context)
+            target = res.context['target']
+            self.assertIn('target', res.context)
+            self.assertIn('saved', res.context)
 
-                self.assertEqual(res.context['target'].version, target.version)
-                self.assertEqual(res.context['saved'].version, saved.version)
-                self.assertEqual(res.context['request_path'], url)
+            self.assertEqual(res.context['target'].version, target.version)
+            self.assertEqual(res.context['saved'].version, saved.version)
+            self.assertEqual(res.context['request_path'], url)
 
 #
 # class TestFullStack(DjangoAdminTestCase):

tox.ini

@@ -22,12 +22,12 @@ markers =
 
 [testenv]
 install_command=pip install {opts} {packages}
-pip_pre = True
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH PYTHONDONTWRITEBYTECODE
 
 whitelist_externals =
                     /usr/local/bin/psql
                     /bin/sh
+                    /usr/local/bin/mysql
                     /usr/local/mysql/bin/mysql
                     /usr/bin/psql
 changedir={toxinidir}
@@ -58,12 +58,9 @@ commands =
     mysql: - mysql -u root -e 'CREATE DATABASE IF NOT EXISTS concurrency;'
     pg: - psql -c 'DROP DATABASE "concurrency";' -U postgres
     pg: - psql -c 'CREATE DATABASE "concurrency";' -U postgres
-    {posargs:py.test tests -rw --create-db}
+    {posargs:py.test tests -rw -v --create-db}
 
 
-[testenv:d110]
-pip_pre=true
-
 [testenv:clean]
 commands =
     mysql: - mysql -u root -e 'DROP DATABASE IF EXISTS concurrency;'