[Python-modules-commits] [django-reversion] 04/08: Refresh patches.

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch debian/master
in repository django-reversion.

commit f87fc06f4e6b48475250dfab52e02aeeaa31bb7e
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Dec 8 19:27:21 2017 +0100

    Refresh patches.
---
 debian/changelog                                   |  1 +
 .../0001-Skip-postgresql-and-mysql-tests.patch     | 34 ++++++++++++++++------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4989e55..3228e18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 django-reversion (2.0.12-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh patches.
 
  -- Michael Fladischer <fladi at debian.org>  Fri, 08 Dec 2017 19:26:34 +0100
 
diff --git a/debian/patches/0001-Skip-postgresql-and-mysql-tests.patch b/debian/patches/0001-Skip-postgresql-and-mysql-tests.patch
index c8be0ea..83755dd 100644
--- a/debian/patches/0001-Skip-postgresql-and-mysql-tests.patch
+++ b/debian/patches/0001-Skip-postgresql-and-mysql-tests.patch
@@ -5,12 +5,12 @@ Subject: Skip postgresql and mysql tests.
 ---
  tests/test_app/tests/test_api.py      | 15 +++++++++++++++
  tests/test_app/tests/test_commands.py | 18 ++++++++++++++++++
- tests/test_app/tests/test_models.py   | 22 ++++++++++++++++++++++
+ tests/test_app/tests/test_models.py   | 24 ++++++++++++++++++++++++
  tests/test_project/settings.py        | 27 +++++++++++++++++++++------
- 4 files changed, 76 insertions(+), 6 deletions(-)
+ 4 files changed, 78 insertions(+), 6 deletions(-)
 
 diff --git a/tests/test_app/tests/test_api.py b/tests/test_app/tests/test_api.py
-index 24201a2..2b8c7bb 100644
+index e12b102..f2a54ee 100644
 --- a/tests/test_app/tests/test_api.py
 +++ b/tests/test_app/tests/test_api.py
 @@ -1,3 +1,4 @@
@@ -133,7 +133,7 @@ index bb950ad..0cc406f 100644
          with reversion.create_revision():
              TestModel.objects.db_manager("postgres").create()
 diff --git a/tests/test_app/tests/test_models.py b/tests/test_app/tests/test_models.py
-index f3f13c7..c278385 100644
+index 80f893d..04ca1aa 100644
 --- a/tests/test_app/tests/test_models.py
 +++ b/tests/test_app/tests/test_models.py
 @@ -1,9 +1,20 @@
@@ -217,7 +217,23 @@ index f3f13c7..c278385 100644
      def testGetForObjectReferenceModelDbMySql(self):
          with reversion.create_revision():
              obj = TestModel.objects.db_manager("mysql").create()
-@@ -180,6 +199,7 @@ class GetDeletedTest(TestModelMixin, TestBase):
+@@ -177,6 +196,7 @@ class GetDeletedTest(TestModelMixin, TestBase):
+         self.assertEqual(Version.objects.get_deleted(TestModel)[0].object_id, force_text(pk_2))
+         self.assertEqual(Version.objects.get_deleted(TestModel)[1].object_id, force_text(pk_1))
+ 
++    @unittest.skipIf(not psycopg2, "psycopg2 not installed")
+     def testGetDeletedPostgres(self):
+         with reversion.create_revision(using="postgres"):
+             obj = TestModel.objects.using("postgres").create()
+@@ -185,6 +205,7 @@ class GetDeletedTest(TestModelMixin, TestBase):
+         obj.delete()
+         self.assertEqual(Version.objects.using("postgres").get_deleted(TestModel, model_db="postgres").count(), 1)
+ 
++    @unittest.skipIf(not MySQLdb, "MySQLdb not installed")
+     def testGetDeletedMySQL(self):
+         with reversion.create_revision(using="mysql"):
+             obj = TestModel.objects.using("mysql").create()
+@@ -196,6 +217,7 @@ class GetDeletedTest(TestModelMixin, TestBase):
  
  class GetDeletedDbTest(TestModelMixin, TestBase):
  
@@ -225,7 +241,7 @@ index f3f13c7..c278385 100644
      def testGetDeletedDb(self):
          with reversion.create_revision(using="postgres"):
              obj = TestModel.objects.create()
-@@ -187,6 +207,7 @@ class GetDeletedDbTest(TestModelMixin, TestBase):
+@@ -203,6 +225,7 @@ class GetDeletedDbTest(TestModelMixin, TestBase):
          self.assertEqual(Version.objects.get_deleted(TestModel).count(), 0)
          self.assertEqual(Version.objects.using("postgres").get_deleted(TestModel).count(), 1)
  
@@ -233,7 +249,7 @@ index f3f13c7..c278385 100644
      def testGetDeletedDbMySql(self):
          with reversion.create_revision(using="mysql"):
              obj = TestModel.objects.create()
-@@ -197,6 +218,7 @@ class GetDeletedDbTest(TestModelMixin, TestBase):
+@@ -213,6 +236,7 @@ class GetDeletedDbTest(TestModelMixin, TestBase):
  
  class GetDeletedModelDbTest(TestModelMixin, TestBase):
  
@@ -242,7 +258,7 @@ index f3f13c7..c278385 100644
          with reversion.create_revision():
              obj = TestModel.objects.db_manager("postgres").create()
 diff --git a/tests/test_project/settings.py b/tests/test_project/settings.py
-index 395a30e..46f073e 100644
+index 2df52e2..79191fb 100644
 --- a/tests/test_project/settings.py
 +++ b/tests/test_project/settings.py
 @@ -13,6 +13,17 @@ https://docs.djangoproject.com/en/dev/ref/settings/
@@ -263,7 +279,7 @@ index 395a30e..46f073e 100644
  # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
  BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
  
-@@ -81,20 +92,24 @@ DATABASES = {
+@@ -80,20 +91,24 @@ DATABASES = {
      "default": {
          "ENGINE": "django.db.backends.sqlite3",
          "NAME": os.path.join(BASE_DIR, "db.sqlite3"),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-reversion.git