From 7651b596a3f4d254220ae7da447a07e748908ab3 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Sat, 28 Nov 2015 18:15:52 +0800 Subject: [PATCH] Fix Resource.__eq__ mismatch semantics of object equal The __eq__ of apiclient.base.Resource will return True, if the two objects have same id, even if they have different other attributes value. The behavior is weird and don't match the semantics of object equal. The objects that have different value should be different objects. Fix this issue and add some test cases in this patch. Change-Id: I24ba39bf90d727116f256de46241746520efbfee Closes-Bug: #1499369 --- glanceclient/openstack/common/apiclient/base.py | 2 -- glanceclient/tests/unit/test_base.py | 10 ++++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/glanceclient/openstack/common/apiclient/base.py b/glanceclient/openstack/common/apiclient/base.py index cf3eab92..c86613ee 100644 --- a/glanceclient/openstack/common/apiclient/base.py +++ b/glanceclient/openstack/common/apiclient/base.py @@ -517,8 +517,6 @@ class Resource(object): # two resources of different types are not equal if not isinstance(other, self.__class__): return False - if hasattr(self, 'id') and hasattr(other, 'id'): - return self.id == other.id return self._info == other._info def is_loaded(self): diff --git a/glanceclient/tests/unit/test_base.py b/glanceclient/tests/unit/test_base.py index 4a97de80..ddbc3d70 100644 --- a/glanceclient/tests/unit/test_base.py +++ b/glanceclient/tests/unit/test_base.py @@ -32,10 +32,16 @@ class TestBase(testtools.TestCase): id = 4 self.assertEqual(4, base.getid(TmpObject)) - def test_two_resources_with_same_id_are_equal(self): - # Two resources of the same type with the same id: equal + def test_two_resources_with_same_id_are_not_equal(self): + # Two resources with same ID: never equal if their info is not equal r1 = base.Resource(None, {'id': 1, 'name': 'hi'}) r2 = base.Resource(None, {'id': 1, 'name': 'hello'}) + self.assertNotEqual(r1, r2) + + def test_two_resources_with_same_id_and_info_are_equal(self): + # Two resources with same ID: equal if their info is equal + r1 = base.Resource(None, {'id': 1, 'name': 'hello'}) + r2 = base.Resource(None, {'id': 1, 'name': 'hello'}) self.assertEqual(r1, r2) def test_two_resources_with_eq_info_are_equal(self):