openstack/python-glanceclient
Code Issues Proposed changes

Fix Resource.__eq__ mismatch semantics of object equal

Browse Source 
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
This commit is contained in:
Rui Chen
2015-11-28 18:15:52 +08:00
parent c4cb6a42ef
commit 7651b596a3
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glanceclient/openstack/common/apiclient/base.py
View File

@@ -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):

10
glanceclient/tests/unit/test_base.py
View File

@@ -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):