Add DbdiffTestMixin, drop dj17 support

Author: jpic

.travis.yml

@@ -4,9 +4,6 @@ python:
 - '3.5'
 env:
   matrix:
-  - TOXENV=py27-django17-sqlite
-  - TOXENV=py27-django17-mysql
-  - TOXENV=py27-django17-postgresql
   - TOXENV=py27-django18-sqlite
   - TOXENV=py27-django18-mysql
   - TOXENV=py27-django18-postgresql
@@ -16,9 +13,6 @@ env:
   - TOXENV=py27-django110-sqlite
   - TOXENV=py27-django110-mysql
   - TOXENV=py27-django110-postgresql
-  - TOXENV=py34-django17-sqlite
-  - TOXENV=py34-django17-mysql
-  - TOXENV=py34-django17-postgresql
   - TOXENV=py34-django18-sqlite
   - TOXENV=py34-django18-mysql
   - TOXENV=py34-django18-postgresql

CHANGELOG

@@ -1 +1,3 @@
+0.7.0 Added DbdiffTestMixin
+
 0.6.0 Added exclude

dbdiff/test.py

@@ -0,0 +1,69 @@
+"""Convenience test mixin."""
+from django.core.management import call_command
+from django.db import connection
+
+from .fixture import Fixture
+
+
+class DbdiffTestMixin(object):
+    """
+    Convenience mixin with better sequence resetting than TransactionTestCase.
+
+    The difference with using TransactionTestCase with reset_sequences=True is
+    that this will reset sequences for the given models to their higher value,
+    supporting pre-existing models which could have been created by a
+    migration.
+
+    The test case subclass requires some attributes and an implementation of a
+    ``dbdiff_test()`` method that does the actual import call that this
+    should test. Example usage::
+
+        class FrancedataImportTest(DbdiffTestMixin, test.TestCase):
+            dbdiff_models = [YourModel]
+            dbdiff_exclude = {'*': ['created']}
+            dbdiff_reset_sequences = True
+            dbdiff_expected = 'yourapp/tests/yourexpectedfixture.json'
+            dbdiff_fixtures = ['your-fixtures.json']
+
+            def dbdiff_test(self):
+                fixture = os.path.join(
+                    os.path.dirname(__file__),
+                    'representatives_fixture.json'
+                )
+
+                with open(fixture, 'r') as f:
+                    do_your_import.main(f)
+
+    Supports postgresql.
+    """
+
+    def test_db_import(self):
+        """Actual test method, ran by the test suite."""
+        call_command('flush', interactive=False)
+
+        for fixture in getattr(self, 'dbdiff_fixtures', []):
+            call_command('loaddata', fixture)
+
+        for model in self.dbdiff_models:
+            if connection.vendor == 'postgresql':
+                reset = """
+                SELECT
+                    setval(
+                        pg_get_serial_sequence('%s', 'id'),
+                        coalesce(max(id),0) + 1,
+                        false
+                    )
+                FROM %s
+                """ % (model._meta.db_table, model._meta.db_table)
+            else:
+                raise NotImplemented()
+            connection.cursor().execute(reset)
+
+        self.dbdiff_test()
+
+        Fixture(
+            self.dbdiff_expected,
+            models=self.dbdiff_models,
+        ).assertNoDiff(
+            exclude=self.dbdiff_exclude,
+        )

dbdiff/tests/test_mixin.json

@@ -0,0 +1,66 @@
+[
+{
+    "fields": {
+        "app_label": "admin",
+        "model": "logentry"
+    },
+    "model": "contenttypes.contenttype",
+    "pk": 1
+},
+{
+    "fields": {
+        "app_label": "auth",
+        "model": "permission"
+    },
+    "model": "contenttypes.contenttype",
+    "pk": 2
+},
+{
+    "fields": {
+        "app_label": "auth",
+        "model": "group"
+    },
+    "model": "contenttypes.contenttype",
+    "pk": 3
+},
+{
+    "fields": {
+        "app_label": "auth",
+        "model": "user"
+    },
+    "model": "contenttypes.contenttype",
+    "pk": 4
+},
+{
+    "fields": {
+        "app_label": "contenttypes",
+        "model": "contenttype"
+    },
+    "model": "contenttypes.contenttype",
+    "pk": 5
+},
+{
+    "fields": {
+        "app_label": "sessions",
+        "model": "session"
+    },
+    "model": "contenttypes.contenttype",
+    "pk": 6
+},
+{
+    "fields": {
+        "app_label": "decimal_test",
+        "model": "testmodel"
+    },
+    "model": "contenttypes.contenttype",
+    "pk": 7
+},
+{
+    "fields": {
+        "app_label": "",
+        "model": ""
+    },
+    "model": "contenttypes.contenttype",
+    "pk": 8
+}
+]

dbdiff/tests/test_mixin.py

@@ -0,0 +1,22 @@
+from dbdiff.test import DbdiffTestMixin
+
+from django import test
+from django.contrib.contenttypes.models import ContentType
+from django.db import connection
+
+
+class ContentTypeTestCase(DbdiffTestMixin, test.TestCase):
+    dbdiff_models = [ContentType]
+    dbdiff_exclude = {'*': ['created']}
+    dbdiff_reset_sequences = True
+    dbdiff_expected = 'dbdiff/tests/test_mixin.json'
+
+    def test_db_import(self):
+        if connection.vendor != 'postgresql':
+            return  # not supported for now
+        super(ContentTypeTestCase, self).test_db_import()
+        self.assertTrue(self.dbdiff_test_executed)
+
+    def dbdiff_test(self):
+        ContentType.objects.create()
+        self.dbdiff_test_executed = True

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34}-django{17,18,19,110}{-sqlite,-mysql,-postgresql}
+envlist = py{27,34}-django{18,19,110}{-sqlite,-mysql,-postgresql}
 
 [testenv]
 usedevelop = true
@@ -16,7 +16,6 @@ deps =
     pytest-cov
     mock
     coverage
-    django17: Django>=1.7,<1.8
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: https://github.com/django/django/archive/master.tar.gz