From fcbb2d724899e265e168100718399f7886f3f1f5 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Tue, 1 Dec 2015 20:32:51 +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: I1565c6e66d6dd6cf7bd2b7e8526157190deb45de Closes-Bug: #1499369 --- keystoneclient/base.py | 2 -- keystoneclient/tests/unit/test_base.py | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/keystoneclient/base.py b/keystoneclient/base.py index a03eceeea..9676b57ce 100644 --- a/keystoneclient/base.py +++ b/keystoneclient/base.py @@ -521,8 +521,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/keystoneclient/tests/unit/test_base.py b/keystoneclient/tests/unit/test_base.py index 601aa33fd..38644c01f 100644 --- a/keystoneclient/tests/unit/test_base.py +++ b/keystoneclient/tests/unit/test_base.py @@ -53,9 +53,14 @@ class BaseTest(utils.TestCase): self.assertRaises(AttributeError, getattr, f, 'blahblah') 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