From eb1cddbc28f507b117fe3b1808aea78724151e88 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Sat, 28 Nov 2015 16:04:40 +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: I187032e5630ac47a4f54db5058dbf9b6e15eba6d Closes-Bug: #1499369 --- cinderclient/openstack/common/apiclient/base.py | 2 -- cinderclient/tests/unit/test_base.py | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cinderclient/openstack/common/apiclient/base.py b/cinderclient/openstack/common/apiclient/base.py index 3645f6874..2c2e7e916 100644 --- a/cinderclient/openstack/common/apiclient/base.py +++ b/cinderclient/openstack/common/apiclient/base.py @@ -522,8 +522,6 @@ class Resource(RequestIdMixin): # 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/cinderclient/tests/unit/test_base.py b/cinderclient/tests/unit/test_base.py index 67265a78e..48ec60b72 100644 --- a/cinderclient/tests/unit/test_base.py +++ b/cinderclient/tests/unit/test_base.py @@ -48,9 +48,14 @@ class BaseTest(utils.TestCase): self.assertEqual(4, base.getid(TmpObject)) def test_eq(self): - # Two resources of the same type with the same id: equal + # 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) + + # 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) # Two resoruces of different types: never equal