[Python-modules-commits] [django-picklefield] 10/15: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to tag debian/0.3.2-1
in repository django-picklefield.

commit 838710f1085c8ff73f6d56e2c3f5237505e07cef
Merge: 08aaf7d e734fba
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Mar 31 20:52:05 2016 +0200

    merge patched into master

 debian/.git-dpm                | 6 +++---
 debian/patches/fix_tests.patch | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 7c18337,0000000..3cad17f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 94f24d0f022b4c5835fa35a3d7cafaceebe47f99
- 94f24d0f022b4c5835fa35a3d7cafaceebe47f99
- 46c6809aea1dfa066aeea21190adb26876b77ee2
++e734fbaf6fa03f984df4d9f473679dca324fdeff
++e734fbaf6fa03f984df4d9f473679dca324fdeff
++3b92ee0c27c8ebd6eab0881cb5d15413045edbd0
 +3b92ee0c27c8ebd6eab0881cb5d15413045edbd0
 +django-picklefield_0.3.2.orig.tar.gz
 +6f19f9e20838b94efb98c81ac645a079d40f04f7
 +9715
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/fix_tests.patch
index eed11ce,0000000..b710ead
mode 100644,000000..100644
--- a/debian/patches/fix_tests.patch
+++ b/debian/patches/fix_tests.patch
@@@ -1,30 -1,0 +1,30 @@@
- From 94f24d0f022b4c5835fa35a3d7cafaceebe47f99 Mon Sep 17 00:00:00 2001
++From e734fbaf6fa03f984df4d9f473679dca324fdeff Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <FladischerMichael at fladi.at>
 +Date: Thu, 8 Oct 2015 08:55:32 -0700
 +Subject: compare objects by fields not by instance
 +
 + Upstream tests are comparing the original object directly with the deserialized
 + one. This fails because the default python comparison for objects uses their
 + identity which fails for two different object instances.
 + This patch does the comparison by field for both objects.
 +Last-Update: 2014-08-29
 +Forwarded: https://github.com/shrubberysoft/django-picklefield/pull/16
 +
 +Patch-Name: fix_tests.patch
 +---
 + src/picklefield/tests.py | 5 ++++-
 + 1 file changed, 4 insertions(+), 1 deletion(-)
 +
 +diff --git a/src/picklefield/tests.py b/src/picklefield/tests.py
 +index 2430b21..4e88ee2 100644
 +--- a/src/picklefield/tests.py
 ++++ b/src/picklefield/tests.py
 +@@ -166,4 +166,7 @@ class PickledObjectFieldTests(TestCase):
 +         ])
 + 
 +         for deserialized_test in serializers.deserialize('json', serialized):
 +-            self.assertEqual(deserialized_test.object, model)
 ++            self.assertEquals(deserialized_test.object.pk,
 ++                              model.pk)
 ++            self.assertEquals(deserialized_test.object.pickle_field,
 ++                              model.pickle_field)

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